Changeset 6000

Timestamp:

1 May 2011, 04:05:43 (14 years ago)

Author:

Henrik Bettermann

Message:

Implement faculty manage page by using jQueryUI tabs. RemoveFormPages? are now redundant.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/browser

Files:

• pages.py (modified) (7 diffs)
• templates/facultycontainermanagepage.pt (added)
• templates/facultymanagepage.pt (modified) (2 diffs)
• viewlets.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -155 +155 @@
         return
         
-class RemoveFormPage(WAeUPPage):
-    grok.require('waeup.manageUniversity')
-    grok.name('remove')
-    grok.template('removesubobjectspage')
-    pnav = 1
-
-    def update(self):
-        warning.need()
-        form = self.request.form
-        if 'CANCEL' in form.keys():
-            self.redirect(self.url(self.context))
-        if not 'REMOVE' in form.keys():
-            return
-        child_id = form['val_id']
-        if not isinstance(child_id, list):
-            child_id = [child_id]
-        deleted = []
-        for id in child_id:
-            try:
-                del self.context[id]
-                deleted.append(id)
-            except:
-                self.flash('Could not delete %s: %s: %s' % (
-                        id, sys.exc_info()[0], sys.exc_info()[1]))
-        if len(deleted):
-            self.flash('Successfully removed: %s' % ', '.join(deleted))
-        # We have to redirect to let flash messages appear immediately...
-        self.redirect(self.url())
-        return
+#class RemoveFormPage(WAeUPPage):
+#    grok.require('waeup.manageUniversity')
+#    grok.name('remove')
+#    grok.template('removesubobjectspage')
+#    pnav = 1
+#
+#    def update(self):
+#        warning.need()
+#        form = self.request.form
+#        if 'CANCEL' in form.keys():
+#            self.redirect(self.url(self.context))
+#        if not 'REMOVE' in form.keys():
+#            return
+#        child_id = form['val_id']
+#        if not isinstance(child_id, list):
+#            child_id = [child_id]
+#        deleted = []
+#        for id in child_id:
+#            try:
+#                del self.context[id]
+#                deleted.append(id)
+#            except:
+#                self.flash('Could not delete %s: %s: %s' % (
+#                        id, sys.exc_info()[0], sys.exc_info()[1]))
+#        if len(deleted):
+#            self.flash('Successfully removed: %s' % ', '.join(deleted))
+#        # We have to redirect to let flash messages appear immediately...
+#        self.redirect(self.url())
+#        return
 
 class AdministrationPage(WAeUPPage):
@@ -846 +846 @@
     grok.name('index')
     title = 'Academics'
-    label = 'Faculties'
+    label = 'Academic Section'
     pnav = 1
     grok.template('facultypage')
@@ -884 +884 @@
                                   'in the database')
             return
-        self.redirect(self.url(self.context))
+        self.redirect(self.url(self.context, u'@@manage')+'#tab-1')
         
     @grok.action('Cancel')
@@ -890 +890 @@
         self.redirect(self.url(self.context))   
 
-class RemoveFacultyFormPage(RemoveFormPage):
-    """ Remove Faculty Page 
-    """
-    grok.context(IFacultyContainer)
-    title = "Remove faculty"
-    pnav = 1
+#class RemoveFacultyFormPage(RemoveFormPage):
+#   """ Remove Faculty Page 
+#    """
+#    grok.context(IFacultyContainer)
+#    title = "Remove faculty"
+#    pnav = 1
 
 #
@@ -953 +953 @@
                                   'in the database')
             return
-        self.redirect(self.url(self.context, u'@@manage'))
+        self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
         
     @grok.action('Cancel')
@@ -969 +969 @@
     taboneactions = ['Save','Save and return','Cancel']
     tabtwoactions = ['Add department', 'Remove selected','Cancel']
+    subunits = 'Departments'
 
     form_fields = grok.AutoFields(IFaculty)
@@ -1007 +1008 @@
         if len(deleted):
             self.flash('Successfully removed: %s' % ', '.join(deleted))
+        self.redirect(self.url(self.context, u'@@manage')+'#tab-2')    
         return       
 
     @grok.action('Add department', validator=NullValidator)
     def addDepartment(self, **data):
+        self.redirect(self.url(self.context, '@@add'))
+        return    
+        
+    @grok.action('Cancel', validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+        return
+
+class ManageFacultyContainerFormPage(WAeUPEditFormPage):
+    """Manage the basic properties of a `Faculty` instance.
+    """
+    grok.context(IFacultyContainer)
+    grok.name('manage')
+    grok.require('waeup.manageUniversity')
+    grok.template('facultycontainermanagepage')
+    pnav = 1
+    taboneactions = ['Add faculty', 'Remove selected','Cancel']
+    subunits = 'Faculties'
+    title = 'Academics'
+
+    @property
+    def label(self):
+        return 'Manage academic section'
+        
+    def update(self):
+        tabs.need()
+        #warning.need()
+        return super(ManageFacultyContainerFormPage, self).update()
+
+    # ToDo: Show warning message before deletion
+    @grok.action('Remove selected')
+    def delFaculties(self, **data):
+        form = self.request.form
+        child_id = form['val_id']
+        if not isinstance(child_id, list):
+            child_id = [child_id]
+        deleted = []
+        for id in child_id:
+            try:
+                del self.context[id]
+                deleted.append(id)
+            except:
+                self.flash('Could not delete %s: %s: %s' % (
+                        id, sys.exc_info()[0], sys.exc_info()[1]))
+        if len(deleted):
+            self.flash('Successfully removed: %s' % ', '.join(deleted))
+        self.redirect(self.url(self.context, '@@manage')+'#tab-1')    
+        return       
+
+    @grok.action('Add faculty', validator=NullValidator)
+    def addFaculty(self, **data):
         self.redirect(self.url(self.context, '@@add'))
         return    

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt

@@ -25 +25 @@
 <ul>
   <li><a href="#tab-1"><span>Settings</span></a></li>
-  <li><a href="#tab-2"><span>Contents</span></a></li>
+  <li><a href="#tab-2"><span tal:content="view/subunits">Contents</span></a></li>
 </ul>
    
@@ -73 +73 @@
     
 <div id="tab-2">
-  <h3>Departments</h3>
+  <h3 tal:content="view/subunits">Departments</h3>
   <table class="zebra">
     <thead>

main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

@@ -310 +310 @@
     grok.view(DatacenterPage)
     text = 'Edit settings'
+
+class ManageFacultyContainerActionButton(ManageActionButton):
+    """ 'Manage settings' button for faculties.
+    """
+    grok.context(IFacultyContainer)
+    grok.view(FacultyContainerPage)
+    text = 'Manage academic section'
     
 class ManageFacultyActionButton(ManageActionButton):
-    """ 'Edit settings' button for faculties.
+    """ 'Manage settings' button for faculties.
     """
     grok.context(IFaculty)
@@ -356 +363 @@
     text = 'Add user'
 
-class AddFacultyActionButton(AddActionButton):
-    grok.context(IFacultyContainer)
-    grok.view(FacultyContainerPage)
-    text = 'Add faculty'
+#class AddFacultyActionButton(AddActionButton):
+#    grok.context(IFacultyContainer)
+#    grok.view(FacultyContainerPage)
+#    text = 'Add faculty'
     
 #class AddDepartmentActionButton(AddActionButton):
@@ -392 +399 @@
 
 
-class RemoveFacultyActionButton(RemoveActionButton):
-    grok.context(IFacultyContainer)
-    grok.view(FacultyContainerPage)
-    text = 'Remove faculty'
+#class RemoveFacultyActionButton(RemoveActionButton):
+#    grok.context(IFacultyContainer)
+#    grok.view(FacultyContainerPage)
+#    text = 'Remove faculty'
    
 #class RemoveDepartmentActionButton(RemoveActionButton):