diff --git a/web/skins/classic/views/group.php b/web/ajax/modals/group.php similarity index 58% rename from web/skins/classic/views/group.php rename to web/ajax/modals/group.php index ee5fcaece..119149951 100644 --- a/web/skins/classic/views/group.php +++ b/web/ajax/modals/group.php @@ -1,22 +1,5 @@ depth()) . $option['Name']; } - return htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('data-on-change'=>'configureButtons')); + return htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('data-on-change'=>'configModalBtns')); } function monitorList($newGroup) { @@ -103,46 +86,50 @@ if ( !empty($_REQUEST['gid']) ) { // // BEGIN HTML // - -xhtmlHeaders(__FILE__, translate('Group').' - '.$newGroup->Name()); ?> - -
- -
-
- +
diff --git a/web/includes/actions/group.php b/web/includes/actions/group.php index b23659d18..ec7a1dc87 100644 --- a/web/includes/actions/group.php +++ b/web/includes/actions/group.php @@ -26,26 +26,24 @@ if ( !canEdit('Groups') ) { return; } -if ( $action == 'Save' ) { +if ( $action == 'save' ) { $group_id = null; - if ( !empty($_POST['gid']) ) - $group_id = $_POST['gid']; + if ( !empty($_REQUEST['gid']) ) + $group_id = $_REQUEST['gid']; $group = new ZM\Group($group_id); $group->save( array( - 'Name'=> $_POST['newGroup']['Name'], - 'ParentId'=>( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ), + 'Name'=> $_REQUEST['newGroup']['Name'], + 'ParentId'=>( $_REQUEST['newGroup']['ParentId'] == '' ? null : $_REQUEST['newGroup']['ParentId'] ), ) ); dbQuery('DELETE FROM `Groups_Monitors` WHERE `GroupId`=?', array($group_id)); $group_id = $group->Id(); if ( $group_id ) { - foreach ( $_POST['newGroup']['MonitorIds'] as $mid ) { + foreach ( $_REQUEST['newGroup']['MonitorIds'] as $mid ) { dbQuery('INSERT INTO `Groups_Monitors` (`GroupId`,`MonitorId`) VALUES (?,?)', array($group_id, $mid)); } } - $view = 'none'; - $refreshParent = true; - $closePopup = true; + $redirect = '?view=groups'; } ?> diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php index db938d26b..90e269a33 100644 --- a/web/skins/classic/views/export.php +++ b/web/skins/classic/views/export.php @@ -63,10 +63,15 @@ xhtmlHeaders(__FILE__, translate('Export'));
- -
+
+
+ + +
+
+

+
+