diff options
| author | tr4ck3ur <tr4ck3ur@style-python.fr> | 2015-02-20 17:44:56 +0100 |
|---|---|---|
| committer | tr4ck3ur <tr4ck3ur@style-python.fr> | 2015-02-20 17:44:56 +0100 |
| commit | e6beb8f49622c3cb14ca47916638b6ac91a7b944 (patch) | |
| tree | 0c6e0554b9fcc03ffd33dfddd3fd2700c6f66623 | |
| parent | 976ec7ddc556092f7ffbe09b067cc98e6c8d5196 (diff) | |
| download | jm2l-e6beb8f49622c3cb14ca47916638b6ac91a7b944.tar.gz jm2l-e6beb8f49622c3cb14ca47916638b6ac91a7b944.tar.bz2 jm2l-e6beb8f49622c3cb14ca47916638b6ac91a7b944.tar.xz jm2l-e6beb8f49622c3cb14ca47916638b6ac91a7b944.zip | |
Fix tasks issue after update,
Fix upload button name
Added link task and taskarea
| -rw-r--r-- | jm2l/models.py | 1 | ||||
| -rw-r--r-- | jm2l/templates/NewIndex.mako | 4 | ||||
| -rw-r--r-- | jm2l/templates/Staff/tasks.mako | 2 | ||||
| -rw-r--r-- | jm2l/views.py | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/jm2l/models.py b/jm2l/models.py index 2500af9..9e33644 100644 --- a/jm2l/models.py +++ b/jm2l/models.py @@ -60,6 +60,7 @@ class Tasks(Base): closed = Column(Integer, default=0) name = Column(Unicode(80)) description = Column(UnicodeText) + area = relationship(TasksArea, backref=backref("tasks") ) @classmethod def by_id(cls, id): diff --git a/jm2l/templates/NewIndex.mako b/jm2l/templates/NewIndex.mako index 30bedbb..e55f45a 100644 --- a/jm2l/templates/NewIndex.mako +++ b/jm2l/templates/NewIndex.mako @@ -11,6 +11,10 @@ <!-- The default timeline stylesheet --> <link rel="stylesheet" href="/vendor/timeline/css/timeline.css" /> </%def> +<div class="pull-right"> +Synchronisez votre calendrier avec <a href="/2015/JM2L.ics">le fichier ical JM2L 2015</a> +</div> +<br> <div id="timeline" style="margin-left: -50px;display:block;"></div> <div class="clearfix"> </div> <div style="top:500px;position: relative"> diff --git a/jm2l/templates/Staff/tasks.mako b/jm2l/templates/Staff/tasks.mako index 2a1d389..b871aa2 100644 --- a/jm2l/templates/Staff/tasks.mako +++ b/jm2l/templates/Staff/tasks.mako @@ -41,5 +41,5 @@ DicForm = { <input type="submit" class="btn btn-primary" value="Valider"></input> </form> % if 'uid' in form._fields.keys(): - ${helpers.uploader("tasks", form.uid.data, u"Attachement" )} + ${helpers.uploader("tasks", form.uid.data, u"une pièce jointe" )} %endif
\ No newline at end of file diff --git a/jm2l/views.py b/jm2l/views.py index b7b11a3..90c4c32 100644 --- a/jm2l/views.py +++ b/jm2l/views.py @@ -301,7 +301,7 @@ def tasks(request): DBSession.merge(Task) else: DBSession.add(Task) - return HTTPFound(location=request.route_url('list_task')) + return HTTPFound(location=request.route_url('list_task')+"#"+slugify(Task.area.name)) return {'form':form } @@ -336,7 +336,7 @@ def action_task(request): Task.closed = False DBSession.merge(Task) request.session.flash('Task was successfully closed!') - return HTTPFound(location=request.route_url('list_task')) + return HTTPFound(location=request.route_url('list_task')+"#"+slugify(Task.area.name)) ## =-=- Here, We handle HTTP requests - User Logged Part -=-= |