Changeset:
0b7ac777c33f
https://sourceforge.net/p/mrbs/hg-code/ci/0b7ac777c33f3f85dcceec5c6943b90714ef6410
Author:
Campbell Morrison <[email protected]>
Date:
Wed Jul 20 11:07:46 2016 +0100
Log message:
Fixed problem with Schedule and Policy tabs not appearing. See SF Bugs #362.
diffstat:
web/js/edit_entry.js.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diffs (44 lines):
diff -r 78c142e23822 -r 0b7ac777c33f web/js/edit_entry.js.php
--- a/web/js/edit_entry.js.php Tue Jul 19 16:57:54 2016 +0100
+++ b/web/js/edit_entry.js.php Wed Jul 20 11:07:46 2016 +0100
@@ -1295,9 +1295,10 @@
});
$('#conflict_check, #policy_check').click(function manageTabs() {
- var tabId;
- var checkResults = $('#check_results');
- var checkTabs = $('#check_tabs');
+ var tabId,
+ tabIndex,
+ checkResults = $('#check_results'),
+ checkTabs = $('#check_tabs');
<?php
// Work out which tab should be selected
// (Slightly long-winded using a switch, but there may be more tabs in
future)
@@ -1312,6 +1313,8 @@
tabId = 'schedule_details';
break;
}
+ tabIndex = $('#details_tabs a[href="#' + tabId +
'"]').parent().index();
+
<?php
// If we've already created the dialog and tabs, then all we have
// to do is re-open the dialog if it has previously been closed and
@@ -1323,7 +1326,7 @@
{
checkResults.dialog("open");
}
- checkTabs.tabs("select", tabId);
+ checkTabs.tabs('option', 'active', tabIndex);
return;
}
<?php
@@ -1332,7 +1335,7 @@
// http://forum.jquery.com/topic/combining-ui-dialog-and-tabs for the
solution.
?>
checkTabs.tabs();
- checkTabs.tabs("select", tabId);
+ checkTabs.tabs('option', 'active', tabIndex);
checkResults.dialog({'width':400, 'height':200,
'minWidth':300, 'minHeight':150,
'draggable':true });
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
