Browse Source

"Retour à la liste" link now goes back to the previous area + current area now being selected when creating new task

master
piernov 9 years ago
parent
commit
85c3f9068f
3 changed files with 23 additions and 10 deletions
  1. +2
    -2
      jm2l/templates/Staff/list.mako
  2. +2
    -2
      jm2l/templates/Staff/tasks.mako
  3. +19
    -6
      jm2l/views.py

+ 2
- 2
jm2l/templates/Staff/list.mako View File

@@ -32,7 +32,7 @@ from slugify import slugify
<thead>
<tr>
<th colspan="2" style="text-align:center;">
<a style="float:right;" class="btn btn-mini btn-info" role="button" href="/Staff/tasks">
<a style="float:right;" class="btn btn-mini btn-info" role="button" href="${request.route_path('handle_task', sep="", task_id="", _query={"pole_id":Entity.uid})}">
<i class="icon-plus-sign icon-white"></i> Ajouter une tâche
</a>
Liste des tâches
@@ -95,4 +95,4 @@ from slugify import slugify
$('a[href="' + location.hash + '"]').tab('show');
}
</script>
</%def>
</%def>

+ 2
- 2
jm2l/templates/Staff/tasks.mako View File

@@ -30,7 +30,7 @@
<noscript><link rel="stylesheet" href="/vendor/fileupload/css/jquery.fileupload-noscript.css"></noscript>
<noscript><link rel="stylesheet" href="/vendor/fileupload/css/jquery.fileupload-ui-noscript.css"></noscript>
</%def>
<a style="float:right;" href="/Staff">Retour à la liste</a>
<a style="float:right;" href="${request.route_path('list_task', _anchor=area)}">Retour à la liste</a>
% if 'uid' in form._fields.keys():
<h3>Editer une tâche</h3>
% else:
@@ -57,4 +57,4 @@ DicForm = {
</form>
% if 'uid' in form._fields.keys():
${helpers.uploader("tasks", form.uid.data, u"une pièce jointe" )}
%endif
%endif

+ 19
- 6
jm2l/views.py View File

@@ -276,6 +276,20 @@ def list_view(request):
@view_config(route_name='handle_task', renderer='jm2l:templates/Staff/tasks.mako')
def tasks(request):
task_id = request.matchdict.get('task_id')
# Convert the pole_id GET parameter to int or 0
try:
pole_id = int(request.params.get('pole_id'))
except (ValueError, TypeError):
pole_id = 0

# Get areas from db
Areas = DBSession.query(TasksArea.uid, TasksArea.name)\
.order_by('name').all()
# Get users from db
Users = DBSession.query(User)\
.filter(User.Staff==1)\
.order_by('nom').all()

if task_id:
Task = Tasks.by_id(int(task_id))
if not Task:
@@ -283,17 +297,16 @@ def tasks(request):
form = EditStaffTasks(request.POST, Task, meta={'csrf_context': request.session})
else:
Task = Tasks()
# Check if the supplied pole_id is in the Areas' range
Task.area_uid = pole_id if 1 < pole_id <= len(Areas) else 1
form = StaffTasks(request.POST, Task, meta={'csrf_context': request.session})

# Put some areas on form
Areas = DBSession.query(TasksArea.uid, TasksArea.name)\
.order_by('name').all()
form.area_uid.choices = Areas
# Put some users on form
Users = DBSession.query(User)\
.filter(User.Staff==1)\
.order_by('nom').all()
form.closed_by.choices = [(u.uid, "%s %s" % (u.nom, u.prenom))
for u in Users]

form.due_date.type = "date"
if request.method == 'POST' and form.validate():
form.populate_obj(Task)
@@ -304,7 +317,7 @@ def tasks(request):
DBSession.add(Task)
DBSession.flush()
return HTTPFound(location=request.route_url('list_task')+"#"+slugify(Task.area.name))
return {'form':form }
return {'form':form, 'area':slugify(Areas[Task.area_uid-1].name)}


@view_config(route_name='handle_pole', renderer='jm2l:templates/Staff/pole.mako')


Loading…
Cancel
Save