Make RequestHolder thread-safe

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

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 15ad5ee9e3218e8d603d9ced57fd012e0e1a4f06..7d636be0fcce12e4a78976bc7cfca4b7dc098478 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,4 +1,5 @@
 from django.utils.translation import ungettext, ugettext as _
 from django.utils.translation import ungettext, ugettext as _

+from django.core.urlresolvers import reverse

 from django.db.models import F
 from forum.models.action import ActionProxy
 from forum.models import Award, Badge, ValidationHash, User
 from django.db.models import F
 from forum.models.action import ActionProxy
 from forum.models import Award, Badge, ValidationHash, User


@@ -23,6 +24,15 @@ class UserJoinsAction(ActionProxy):
         'app_name': APP_SHORT_NAME,
         }
 
         '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")
 
 class EmailValidationAction(ActionProxy):
     verb = _("validated e-mail")
 


@@ -37,7 +47,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')),
         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):
         }
 
 class EditProfileAction(ActionProxy):


@@ -154,9 +164,10 @@ class AwardAction(ActionProxy):
         self.user.save()
 
         self.user.message_set.create(message=_(
         self.user.save()
 
         self.user.message_set.create(message=_(

-                """Congratulations, you have received a badge '%(badge_name)s'. Check out <a href=\"%(profile_url)s\">your profile</a>."""
-                ) %
-        dict(badge_name=award.badge.name, profile_url=self.user.get_profile_url()))
+                """Congratulations, you have received a badge '%(badge_name)s'. <a href="%(badge_url)s">Find out who has it, too</a>."""
+        ) % dict(
+            badge_name=award.badge.name,
+            badge_url=award.badge.get_absolute_url()))

 
     def cancel_action(self):
         award = self.award
 
     def cancel_action(self):
         award = self.award


@@ -182,6 +193,35 @@ class AwardAction(ActionProxy):
         'badge_name': self.award.badge.name,
         }
 
         'badge_name': self.award.badge.name,
         }
 

+
+class ReportAction(ActionProxy):
+    verb = _("suspended")
+
+    def process_data(self, **kwargs):
+        self.extra = kwargs
+        # message here?
+
+
+    def process_action(self):
+
+        all_superusers = User.objects.filter(is_superuser=True)
+
+
+        send_template_email(all_superusers, "notifications/user_reported.html", {
+            'reported': self.extra['reported'],
+            'user':self.user,
+            'message': self.extra['publicmsg']
+            }
+            )
+
+    def describe(self, viewer=None):
+
+        return _("%(user)s reported %(reported) : %(msg)s") % {
+            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+            'reporter': self.extra.get('reported').username,
+            'msg': self.extra.get('publicmsg', _('N/A'))
+        }
+

 class SuspendAction(ActionProxy):
     verb = _("suspended")
 
 class SuspendAction(ActionProxy):
     verb = _("suspended")