COmanage Developers List

Author: benno
Date: 2013-05-09 09:50:12 -0400 (Thu, 09 May 2013)
New Revision: 516

Modified:
   registry/trunk/app/View/CoPeople/fields.inc
   registry/trunk/app/View/CoPersonRoles/fields.inc
   registry/trunk/app/View/OrgIdentities/fields.inc
Log:
jquery tab select call changed (CO-589)

Modified: registry/trunk/app/View/CoPeople/fields.inc
===================================================================
--- registry/trunk/app/View/CoPeople/fields.inc 2013-05-08 23:36:14 UTC (rev 
515)
+++ registry/trunk/app/View/CoPeople/fields.inc 2013-05-09 13:50:12 UTC (rev 
516)
@@ -153,6 +153,7 @@
   
   function js_confirm_autogenerate() {
     // Open the dialog to confirm autogeneration of identifiers
+    var $tabs = $( "#tabs" ).tabs();
     $('#autogenerate-dialog').dialog('open');
   }
 
@@ -163,10 +164,12 @@
     // If returning to this page via redirect, open last used tab
     <?php if(isset($this->request->params['named']['tab'])): ?>
       var selectedtab = "<?php 
print($this->request->params['named']['tab']); ?>";
-      $tabs.tabs('select', '#tabs-' + selectedtab );
+      // The next line is still broken, see CO-613
+      $tabs.tabs('option', 'active', '#tabs-' + selectedtab );
     <?php endif; ?>
     
     // Autogenerate dialog
+    
     $("#autogenerate-dialog").dialog({
       autoOpen: false,
       buttons: {

Modified: registry/trunk/app/View/CoPersonRoles/fields.inc
===================================================================
--- registry/trunk/app/View/CoPersonRoles/fields.inc    2013-05-08 23:36:14 
UTC (rev 515)
+++ registry/trunk/app/View/CoPersonRoles/fields.inc    2013-05-09 13:50:12 
UTC (rev 516)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CO Person Role Fields
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.2
@@ -73,7 +73,8 @@
   // If returning to this page via redirect, open last used tab
   <?php if(isset($this->request->params['named']['tab'])): ?>
     var selectedtab = "<?php print($this->request->params['named']['tab']); 
?>";
-    $tabs.tabs('select', '#tabs-' + selectedtab );
+    // The next line is still broken, see CO-613
+    $tabs.tabs('option', 'active', '#tabs-' + selectedtab );
   <?php endif; ?>
 });
 </script>

Modified: registry/trunk/app/View/OrgIdentities/fields.inc
===================================================================
--- registry/trunk/app/View/OrgIdentities/fields.inc    2013-05-08 23:36:14 
UTC (rev 515)
+++ registry/trunk/app/View/OrgIdentities/fields.inc    2013-05-09 13:50:12 
UTC (rev 516)
@@ -31,7 +31,8 @@
   // If returning to this page via redirect, open last used tab
   <?php if(isset($this->request->params['named']['tab'])): ?>
     var selectedtab = "<?php print($this->request->params['named']['tab']); 
?>";
-    $tabs.tabs('select', '#tabs-' + selectedtab );
+    // The next line is still broken, see CO-613
+    $tabs.tabs('option', 'active', '#tabs-' + selectedtab );
   <?php endif; ?>
 });
 </script>