Changeset 7484 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

16 Jan 2012, 07:06:21 (13 years ago)

Author:

Henrik Bettermann

Message:

Redirect to specified tabs using the request's QUERY_STRING value. This suboptimal solution will be replaced later by a pure Javascript solution.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (8 diffs)
• browser_templates/studycoursemanagepage.pt (modified) (2 diffs)
• browser_templates/studylevelmanagepage.pt (modified) (2 diffs)

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

@@ -716 +716 @@
         warning.need()
         datatable.need()
+        self.tab1 = self.tab2 = ''
+        qs = self.request.get('QUERY_STRING', '')
+        if not qs:
+            qs = 'tab1'
+        setattr(self, qs, 'active')
         return 
 
@@ -738 +743 @@
             self.context.addStudentStudyLevel(
                 self.context.certificate,studylevel)
+            self.flash('Study level has been added.')
         except KeyError:
             self.flash('This level exists.')
-        self.flash('Study level has been added.')
-        self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
+        self.redirect(self.url(self.context, u'@@manage')+'?tab2')
         return
 
@@ -751 +756 @@
         else:
             self.flash('No study level selected.')
-            self.redirect(self.url(self.context, '@@manage')+'#tab-2')
+            self.redirect(self.url(self.context, '@@manage')+'?tab2')
             return
         if not isinstance(child_id, list):
@@ -765 +770 @@
         if len(deleted):
             self.flash('Successfully removed: %s' % ', '.join(deleted))
-        self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
+        self.redirect(self.url(self.context, u'@@manage')+'?tab2')
         return
 
@@ -894 +899 @@
         warning.need()
         datatable.need()
+        self.tab1 = self.tab2 = ''
+        qs = self.request.get('QUERY_STRING', '')
+        if not qs:
+            qs = 'tab1'
+        setattr(self, qs, 'active')
         return
 
@@ -916 +926 @@
         else:
             self.flash('No ticket selected.')
-            self.redirect(self.url(self.context, '@@manage')+'#tab-2')
+            self.redirect(self.url(self.context, '@@manage')+'?tab2')
             return
         if not isinstance(child_id, list):
@@ -930 +940 @@
         if len(deleted):
             self.flash('Successfully removed: %s' % ', '.join(deleted))
-        self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
+        self.redirect(self.url(self.context, u'@@manage')+'?tab2')
         return
 
@@ -1018 +1028 @@
             return
         self.flash('Successfully added %s.' % ticket.code)
-        self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
+        self.redirect(self.url(self.context, u'@@manage')+'?tab2')
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursemanagepage.pt

@@ -3 +3 @@
 
   <ul class="tabs" data-tabs="tabs">
-    <li class="active"><a href="#tab-1"><span>Study Course Data</span></a></li>
-    <li><a href="#tab-2"><span>Study Levels</span></a></li>
+    <li tal:attributes="class view/tab1"><a href="#tab-1"><span>Study Course Data</span></a></li>
+    <li tal:attributes="class view/tab2"><a href="#tab-2"><span>Study Levels</span></a></li>
   </ul>
 
   <div class="tab-content">
-    <div id="tab-1" class="active">
+    <div id="tab-1" tal:attributes="class view/tab1">
       <table class="form-table">
       <tbody>
@@ -41 +41 @@
     </div>
 
-    <div id="tab-2">
+    <div id="tab-2" tal:attributes="class view/tab2">
       <h3>Study Levels (Course Lists)</h3>
       <table class="display dataTableManage">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelmanagepage.pt

@@ -3 +3 @@
 
   <ul class="tabs" data-tabs="tabs">
-    <li class="active"><a href="#tab-1"><span>Study Level Data</span></a></li>
-    <li><a href="#tab-2"><span>Course Tickets</span></a></li>
+    <li tal:attributes="class view/tab1"><a href="#tab-1"><span>Study Level Data</span></a></li>
+    <li tal:attributes="class view/tab2"><a href="#tab-2"><span>Course Tickets</span></a></li>
   </ul>
 
   <div class="tab-content">
-    <div id="tab-1" class="active">
+    <div id="tab-1" tal:attributes="class view/tab1">
       <table class="form-table">
       <tbody>
@@ -41 +41 @@
     </div>
 
-    <div id="tab-2">
+    <div id="tab-2" tal:attributes="class view/tab2">
       <h3>Course Tickets</h3>
       <table class="display dataTableManage">