PC-77: Improvements to sign up & review process. Second round of fixe…

…s to comments.
phenotips · Nov 19, 2015 · 7308371 · 7308371
1 parent 0c0d1b6
commit 7308371
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/ui/src/main/resources/XWiki/AccountRejectionTemplate.xml b/ui/src/main/resources/XWiki/AccountRejectionTemplate.xml
@@ -107,7 +107,7 @@ ${platformName} Support Team&lt;/p&gt;
       <language/>
     </property>
     <property>
-      <subject>PhenomeCentral account status</subject>
+      <subject>${platformName} account status</subject>
     </property>
     <property>
       <text>Dear ${userRealName},

diff --git a/ui/src/main/resources/XWiki/ManualAccountValidation.xml b/ui/src/main/resources/XWiki/ManualAccountValidation.xml
@@ -93,15 +93,12 @@
     #set ($emailStatus = 0)
   #end
 
-  #if ("$!{request.action}" == 'accept')
-    $user.set('active', 1)
-  #elseif("$!{request.action}" == 'reject')
-    $userDoc.delete()
-  #end
-
   #if ($emailStatus == 0)
     #if ("$!{request.action}" == 'accept')
+      $user.set('active', 1)
       $userDoc.save()
+    #elseif("$!{request.action}" == 'reject')
+      $userDoc.delete()
     #end
 true
   #else
@@ -188,7 +185,7 @@ ${platformName} Team&lt;/p&gt;
       <language/>
     </property>
     <property>
-      <subject>Your account at PhenomeCentral has been approved</subject>
+      <subject>Your account at ${platformName} has been approved</subject>
     </property>
     <property>
       <text>Dear ${userRealName},