Hide attention getter when already dealing with validation

liqd · Mar 4, 2014 · c440fe7 · c440fe7
1 parent 3115d71
commit c440fe7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/adhocracy/controllers/user.py b/src/adhocracy/controllers/user.py
@@ -770,11 +770,13 @@ def activate(self, id):
     def ask_activate(self, id):
         c.page_user = get_entity_or_abort(model.User, id,
                                           instance_filter=False)
+        c.hide_activate_attention_getter = True
         return render('/user/ask_activate.html')
 
     def pending_activate(self, id):
         c.page_user = get_entity_or_abort(model.User, id,
                                           instance_filter=False)
+        c.hide_activate_attention_getter = True
         return render('/user/pending_activate.html')
 
     @RequireInternalRequest()

diff --git a/src/adhocracy/templates/components.html b/src/adhocracy/templates/components.html
@@ -411,7 +411,8 @@
         or can.instance.join(c.instance)
         or (c.instance.requires_valid_email()
             and c.user
-            and not c.user.is_email_activated())
+            and not c.user.is_email_activated()
+            and not c.hide_activate_attention_getter)
         or (h.config.get('adhocracy.propose_optional_attributes')
             and c.user.optional_attributes is None))) %>