Changeset 2601

Timestamp:

8 Nov 2007, 22:37:27 (17 years ago)

Author:

Henrik Bettermann

Message:

close also objects in state created

Location:

WAeUP_SRP

Files:

• base/skins/waeup_student/deactivate_students.py (modified) (1 diff)
• base/skins/waeup_student/deactivate_students_form.pt (modified) (2 diffs)
• base/skins/waeup_student/search_students_form.pt (modified) (1 diff)
• fceokene/waeup_custom/search_students_form.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/deactivate_students.py

@@ -47 +47 @@
             if student is not None:
                 for object in student.objectValues():
-                    if context.portal_workflow.getInfoFor(object,'review_state',None) == "open":
+                    if context.portal_workflow.getInfoFor(object,'review_state',None) in ('open','created'):
                         context.portal_workflow.doActionFor(object,'close')
                 context.portal_workflow.doActionFor(student,'deactivate')

WAeUP_SRP/base/skins/waeup_student/deactivate_students_form.pt

@@ -10 +10 @@
     </span>
     <span tal:condition="allowed" tal:omit-tag="">
-      <h3> Deactivate Students</h3><br />
-      You are logged in as member <span tal:replace="info/member|nothing" /> 
-      <br /><br />
+      <h3> Deactivate Student Records</h3><br />
+
       <form action="deactivate_students" method="post"
             enctype="multipart/form-data" class="workflow">
@@ -23 +22 @@
                        id="widget__search_string_widget">
                     <div class="label">
-                      <label for="search_string">Student Ids to be removed</label> (space-separated list)
+                      <label for="search_string">Student Ids to be deactivated</label> (space-separated list)
                     </div>
                     <div class="field">

WAeUP_SRP/base/skins/waeup_student/search_students_form.pt

@@ -28 +28 @@
           <nobr><a href="add_student">Add Student Record</a>        
           &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
-          <nobr><a href="remove_students">Remove Student Record(s)</a>           
+          <nobr><a href="deactivate_students">Deactivate Student Record(s)</a>           
       </span>
       </strong>

WAeUP_SRP/fceokene/waeup_custom/search_students_form.pt

@@ -24 +24 @@
           <nobr><a href="add_student">Add Student Record</a>        
           &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
-          <nobr><a href="remove_students">Remove Student Record(s)</a>           
+          <nobr><a href="deactivate_students">Deactivate Student Record(s)</a>        
       </span>
       </strong>