we need to close both dialogs if users selects No on award points confirmation

[osqa.git] / forum / actions / user.py

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 15ad5ee9e3218e8d603d9ced57fd012e0e1a4f06..c8e075cfd5ad74e28bae2025754744c41435f67c 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -23,6 +23,15 @@ class UserJoinsAction(ActionProxy):
         'app_name': APP_SHORT_NAME,
         }
 
+class UserLoginAction(ActionProxy):
+    verb = _("logged in")
+
+    def describe(self, viewer=None):
+        return _("%(user)s %(have_has)s logged in") % {
+            'user' : self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+            'have_has': self.viewer_or_user_verb(viewer, self.user, _('have'), _('has')),
+        }
+
 class EmailValidationAction(ActionProxy):
     verb = _("validated e-mail")
 
@@ -37,7 +46,7 @@ class EmailValidationAction(ActionProxy):
         return _("%(user)s %(have_has)s validated the e-mail %(email)s") % {
         'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
         'have_has': self.viewer_or_user_verb(viewer, self.user, _('have'), _('has')),
-        'email' : self.user.email
+        'email' : self.user.email if viewer.is_superuser or viewer.is_staff or viewer == self.user else ""
         }
 
 class EditProfileAction(ActionProxy):