# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1235638041 0
# Node ID f9d0bf275917740867a1f80723a79b74f945f399
# Parent  c8ebaacc233753f8e5eb6f67a942ccf163244748
Add the ability to put GroupApplications into the pre-rejected state.

Patch by: Lennard de Rijk
Reviewed by: to-be-reviewed

diff -r c8ebaacc2337 -r f9d0bf275917 app/soc/templates/soc/org_app/review.html
--- a/app/soc/templates/soc/org_app/review.html	Thu Feb 26 08:38:09 2009 +0000
+++ b/app/soc/templates/soc/org_app/review.html	Thu Feb 26 08:47:21 2009 +0000
@@ -34,11 +34,11 @@
 {% block buttons %}
 <tr>
   <td>
+    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=pre-accepted'" value="Pre-Accept"/>
     <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=accepted'" value="Accept"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=pre-accepted'" value="Pre-Accept"/>
+    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=pre-rejected'" value="Pre-Reject"/>
     <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=rejected'" value="Reject"/>
     <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=ignored'" value="Ignore"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/delete/{{ entity.key.name }}'" value="Delete"/>
   </td>
 </tr>
 </table>
diff -r c8ebaacc2337 -r f9d0bf275917 app/soc/views/models/group_app.py
--- a/app/soc/views/models/group_app.py	Thu Feb 26 08:38:09 2009 +0000
+++ b/app/soc/views/models/group_app.py	Thu Feb 26 08:47:21 2009 +0000
@@ -151,7 +151,7 @@
   @decorators.check_access
   def list(self, request, access_type,
            page_name=None, params=None, filter={}, **kwargs):
-    """Lists all notifications in seperate tables, depending on their status.
+    """Lists all notifications in separate tables, depending on their status.
 
     for parameters see base.list()
     """
@@ -160,6 +160,7 @@
     selection=[('needs review',(redirects.getEditRedirect, params)), 
                ('pre-accepted', (redirects.getEditRedirect, params)),
                ('accepted', (redirects.getEditRedirect, params)),
+               ('pre-rejected', (redirects.getEditRedirect, params)),
                ('rejected', (redirects.getEditRedirect, params)),
                ('ignored', (redirects.getEditRedirect, params)),]
 
@@ -260,7 +261,8 @@
     if 'status' in get_dict.keys():
       status_value = get_dict['status']
 
-      if status_value in ['accepted', 'rejected', 'ignored', 'pre-accepted']:
+      if status_value in ['accepted', 'rejected', 'ignored', 'pre-accepted',
+          'pre-rejected']:
         # this application has been properly reviewed update the status
 
         # only update if the status changes
@@ -318,8 +320,9 @@
     """
 
     selection = [('needs review',(redirects.getReviewRedirect, params)),
+                 ('pre-accepted', (redirects.getReviewRedirect, params)),
                  ('accepted', (redirects.getReviewRedirect, params)),
-                 ('pre-accepted', (redirects.getReviewRedirect, params)),
+                 ('pre-rejected', (redirects.getReviewRedirect, params)),
                  ('rejected', (redirects.getReviewRedirect, params)),
                  ('ignored', (redirects.getReviewRedirect, params)),]