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

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/applicants

Files:

• browser.py (modified) (6 diffs)
• browser_templates/applicantscontainermanagepage.pt (modified) (4 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -116 +116 @@
         if len(deleted):
             self.flash('Successfully removed: %s' % ', '.join(deleted))
-        self.redirect(self.url(self.context, '@@manage')+'#tab-1')
+        self.redirect(self.url(self.context, '@@manage'))
         return
 
@@ -131 +131 @@
     @action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
-        return add_local_role(self,2, **data)
+        return add_local_role(self,3, **data)
 
     @action('Remove selected local roles')
     def delLocalRoles(self, **data):
-        return del_local_roles(self,2,**data)
+        return del_local_roles(self,3,**data)
 
 class ApplicantsContainerAddFormPage(SIRPAddFormPage):
@@ -173 +173 @@
         self.context[code] = container
         self.flash('Added: "%s".' % code)
-        self.redirect(self.url(self.context, u'@@manage')+'#tab-1')
+        self.redirect(self.url(self.context, u'@@manage'))
         return
 
     @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
-        self.redirect(self.url(self.context, '@@manage') + '#tab-1')
+        self.redirect(self.url(self.context, '@@manage'))
 
 class ApplicantsRootBreadcrumb(Breadcrumb):
@@ -252 +252 @@
         datepicker.need() # Enable jQuery datepicker in date fields.
         tabs.need()
+        self.tab1 = self.tab2 = self.tab3 = ''
+        qs = self.request.get('QUERY_STRING', '')
+        if not qs:
+            qs = 'tab1'
+        setattr(self, qs, 'active')
         warning.need()
         datatable.need()  # Enable jQurey datatables for contents listing
@@ -283 +288 @@
         else:
             self.flash('No applicant 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):
@@ -297 +302 @@
         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
 

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt

@@ -2 +2 @@
 
   <ul class="tabs" data-tabs="tabs">
-    <li class="active">
+    <li tal:attributes="class view/tab1">
     <a href="#tab-1">
       <span>Settings
       </span></a>
     </li>
-    <li>
+    <li tal:attributes="class view/tab2">
     <a href="#tab-2">
       <span>Applicants
       </span></a>
     </li>
-    <li>
+    <li tal:attributes="class view/tab3">
     <a href="#tab-3">
       <span>Local Roles
@@ -19 +19 @@
   </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>
@@ -53 +53 @@
       </div>
     </div>
-    <div id="tab-2"> <h3>Applicants</h3>
+    <div id="tab-2" tal:attributes="class view/tab2"> <h3>Applicants</h3>
       <table class="display dataTableManage">
         <thead>
@@ -100 +100 @@
       </div>
     </div>
-    <div id="tab-3"> <br />
+    <div id="tab-3" tal:attributes="class view/tab3"> <br />
       <table class="display dataTableManage">
         <thead>

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_browser.py

@@ -254 +254 @@
         self.browser.open(self.add_container_path)
         self.browser.getControl("Cancel").click()
-        self.assertEqual(self.browser.url, self.manage_root_path + '#tab-1')
+        self.assertEqual(self.browser.url, self.manage_root_path)
         self.browser.open(self.add_container_path)
         self.browser.getControl(name="form.prefix").value = ['app']