changeset 136:51c2cba0edcd

Messages telling users they'll have to wait for their persona/changes to be approved are now only shown if the user doesn't have permission to publish.
author Atul Varma <varmaa@toolness.com>
date Thu, 03 Apr 2008 14:37:46 -0700
parents bc25c5570ad8
children a0a296613066
files personasbackend/personas/views.py
diffstat 1 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/personasbackend/personas/views.py	Thu Apr 03 14:32:54 2008 -0700
+++ b/personasbackend/personas/views.py	Thu Apr 03 14:37:46 2008 -0700
@@ -101,17 +101,22 @@
             newPersona = form.save( commit=False )
 
             if persona is None:
-                msgText = ("Persona created successfully.  It will need "
-                           "to be reviewed by a staff member "
-                           "before it is published.")
+                msgText = "Persona created successfully."
+                waitText = ("It will need "
+                            "to be reviewed by a staff member "
+                            "before it is published.")
             else:
                 if (not newPersona.header_img) and persona.header_img:
                     newPersona.header_img = persona.header_img
                 if (not newPersona.footer_img) and persona.footer_img:
                     newPersona.footer_img = persona.footer_img
-                msgText = ("Persona edited successfully.  Your changes "
-                           "will need to be approved by a staff member "
-                           "before they can take effect.")
+                msgText = "Persona edited successfully."
+                waitText = ("Your changes "
+                            "will need to be approved by a staff member "
+                            "before they can take effect.")
+
+            if not request.user.has_perm("personas.can_publish"):
+                msgText += " " + waitText
 
             newPersona.save( updater = request.user )
             request.user.message_set.create( message = msgText )