Do some checks and housekeeping when choice identification view is called

Author: reinhardt

src/euphorie/client/browser/choice.py

@@ -1,3 +1,4 @@
+from euphorie.client import utils
 from euphorie.client.navigation import getTreeData
 from plone import api
 from plone.memoize.instance import memoize
@@ -14,15 +15,45 @@ class IdentificationView(BrowserView):
     def webhelpers(self):
         return api.content.get_view("webhelpers", self.context.aq_parent, self.request)
 
+    def check_render_condition(self):
+        # Render the page only if the user can inspection rights,
+        # otherwise redirect to the start page of the session.
+        if not self.webhelpers.can_inspect_session:
+            return self.request.response.redirect(
+                "{session_url}/@@start".format(
+                    session_url=self.webhelpers.traversed_session.absolute_url()
+                )
+            )
+        if self.webhelpers.redirectOnSurveyUpdate():
+            return
+
     @property
     @memoize
     def navigation(self):
         return api.content.get_view("navigation", self.context, self.request)
 
+    def _get_next(self, reply):
+        _next = reply.get("next", None)
+        # In Safari browser we get a list
+        if isinstance(_next, list):
+            _next = _next.pop()
+        return _next
+
     @property
     def tree(self):
         return getTreeData(self.request, self.context)
 
+    @property
+    @memoize
+    def session(self):
+        return self.webhelpers.traversed_session.session
+
+    @property
+    @memoize
+    def survey(self):
+        """This is the survey dexterity object."""
+        return self.webhelpers._survey
+
     @property
     @memoize
     def choice(self):
@@ -45,7 +76,7 @@ def set_answer_data(self, reply):
         #         self.webhelpers.traversed_session.restrictedTraverse(path)
         #     except KeyError:
         #        answer.remove(path)
-        self.context.set_options_by_zodb_path(answer)
+        return self.context.set_options_by_zodb_path(answer)
 
     def __call__(self):
         # Render the page only if the user has inspection rights,
@@ -54,8 +85,23 @@ def __call__(self):
             return self.request.response.redirect(
                 self.context.aq_parent.absolute_url() + "/@@start"
             )
+        self.check_render_condition()
+
+        utils.setLanguage(self.request, self.survey, self.survey.language)
+
         if self.request.method == "POST":
             reply = self.request.form
-            self.set_answer_data(reply)
+            if not self.webhelpers.can_edit_session:
+                return self.navigation.proceed_to_next(reply)
+            _next = self._get_next(reply)
+            # Don't persist anything if the user skipped the question
+            if _next == "skip":
+                return self.navigation.proceed_to_next(reply)
+
+            changed = self.set_answer_data(reply)
+
+            if changed:
+                self.session.touch()
+
             return self.navigation.proceed_to_next(reply)
         return self.index()

src/euphorie/client/model.py

@@ -1539,15 +1539,19 @@ def is_visible(self):
 
     def set_options_by_zodb_path(self, paths):
         current = [option.zodb_path for option in self.options]
+        changed = False
         for option in self.options:
             if option.zodb_path not in paths:
                 self.options.remove(option)
                 Session.delete(option)
+                changed = True
         for path in paths:
             if path not in current:
                 option = Option(choice=self, zodb_path=path)
                 Session.add(option)
                 self.options.append(option)
+                changed = True
+        return changed
 
 
 class Option(BaseObject):