entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

last opened ressource preselected in dialogs

This commit is contained in:
Serghei Mihai 2014-03-27 10:01:42 +01:00
parent 1610c1933d
commit 2136241a8f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calebasse/agenda/views.py
View File

@ -80,7 +80,7 @@ class AgendaHomepageView(TemplateView):
class AgendaServiceActivityView(TemplateView, cbv.ServiceViewMixin):
template_name = 'agenda/service-activity.html'
cookies_to_clear = [('agenda-tabs', )]
cookies_to_clear = [('agenda-tabs', ), ('active-agenda', ), ('last-ressource', )]
def get_context_data(self, **kwargs):
context = super(AgendaServiceActivityView, self).get_context_data(**kwargs)
@ -323,7 +323,7 @@ class DeleteEventView(cbv.DeleteView):
class AgendaServiceActValidationView(TemplateView):
template_name = 'agenda/act-validation.html'
cookies_to_clear = [('agenda-tabs', )]
cookies_to_clear = [('agenda-tabs', ), ('active-agenda', ), ('last-ressource', )]
def acts_of_the_day(self):
acts = list(Act.objects \
@ -453,7 +453,7 @@ class UnlockAllView(CreateView):
class AgendasTherapeutesView(AgendaHomepageView):
template_name = 'agenda/agendas-therapeutes.html'
cookies_to_clear = [('agenda-tabs', )]
cookies_to_clear = [('agenda-tabs', ), ('active-agenda', ), ('last-ressource', )]
def get_context_data(self, **kwargs):
context = super(AgendasTherapeutesView, self).get_context_data(**kwargs)
@ -681,7 +681,7 @@ class AjaxRessourceDisponibilityColumnView(AjaxWorkerDisponibilityColumnView):
class PeriodicEventsView(cbv.ListView):
model = EventWithAct
template_name = 'agenda/periodic-events.html'
cookies_to_clear = [('agenda-tabs', )]
cookies_to_clear = [('agenda-tabs', ), ('active-agenda', ), ('last-ressource', )]
def dispatch(self, request, *args, **kwargs):
if 'worker_id' in kwargs:

4
calebasse/static/js/calebasse.agenda.js
View File

@ -328,6 +328,10 @@ function event_dialog(url, title, width, btn_text) {
$(function() {
$('#tabs').tabs({
load: function(event, ui) {
var tab = $(ui.tab).attr('id').split('-');
if(tab[0] == 'ressource')
$.cookie('last-ressource', tab[1], { path: COOKIE_PATH });
$('#tabs > div > div').accordion({active: false,
autoHeight: false,
collapsible: true});