From a5ffd91bf5d17ee5b3bbfc271c96d9b8aa8886ea Mon Sep 17 00:00:00 2001 From: Code Raguet Date: Thu, 26 Sep 2013 16:09:37 +0000 Subject: Merge branch 'DEV' --- (limited to 'webapp/polls/views.py') diff --git a/webapp/polls/views.py b/webapp/polls/views.py index db297ac..c19eac1 100644 --- a/webapp/polls/views.py +++ b/webapp/polls/views.py @@ -168,7 +168,8 @@ class PollListView(ListView): ), }, 'action_structure_builder': { - 'disabled': "disabled" if not poll.is_open() else "", + 'disabled': ("disabled" if + poll.structure.is_read_only() else ""), 'url': reverse( 'sociologist:structure.builder', kwargs={'poll_id': str(poll.id)} @@ -199,9 +200,13 @@ class StructureFormView(TemplateView): def get(self, request, *args, **kwargs): context = self.get_context_data() + structure = self.poll.structure - context.update({'structure': self.poll.structure}) + read_only = Structure.READ_ONLY_MSG + msg = read_only if structure.is_read_only() else '' + messages.add_message(self.request, messages.WARNING, msg) + context.update({'structure': structure}) return self.render_to_response(context) def get_context_data(self, **kwargs): -- cgit v0.9.1