summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3256942)
raw | patch | inline | side by side (parent: 3256942)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 1 Jul 2009 13:24:47 +0000 (13:24 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 1 Jul 2009 13:24:47 +0000 (13:24 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13870 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-plugins/roleManagement/admin/roleManagement/class_divListRole.inc b/gosa-plugins/roleManagement/admin/roleManagement/class_divListRole.inc
index d83524efebff6eee981188c555dfe84352d02970..18058ceaac08a4883132849de316904033bd0fd4 100644 (file)
$this->parent = $parent;
$this->ui = get_userinfo();
+
+ // Dynamic action col, depending on snapshot icons
$action_col_size = 90;
+ if($this->parent->snapshotEnabled()){
+ $action_col_size += 38;
+ }
// Set list strings
$this->SetTitle(_("List of roles"));
$s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
" "._("Remove")."|"."remove_multiple_roles|\n";
+ /* Add snapshot icons */
+ $s .= $this->parent->get_snapshot_header($this->selectedBase,$this->module);
+
$this->SetDropDownHeaderMenu($s);
$this->SetListHeader($listhead);
}
// Defining Links
$editlink = "<a href='?plug=".$_GET['plug']."&id=%s&act=edit_entry'>%s</a>";
+ // Dynamic action col, depending on snapshot icons
$action_col_size = 90;
+ if($this->parent->snapshotEnabled()){
+ $action_col_size += 38;
+ }
$ui = get_userinfo();
diff --git a/gosa-plugins/roleManagement/admin/roleManagement/class_roleGeneric.inc b/gosa-plugins/roleManagement/admin/roleManagement/class_roleGeneric.inc
index 2bfe6d1df26904d8ad3295509308dd6813670a6a..dc914b0b5548cc64cfd8b3160ed4cdf530b852bc 100644 (file)
return($bases);
}
-
+
+ function save_object()
+ {
+ plugin::save_object();
+ if(isset($_POST['base'])){
+ $this->base = get_post('base');
+ }
+ }
+
+
static function plInfo()
{
return (array(
diff --git a/gosa-plugins/roleManagement/admin/roleManagement/class_roleManagement.inc b/gosa-plugins/roleManagement/admin/roleManagement/class_roleManagement.inc
index 0d03e8d484d4251a7506c698dac46c71fbd9224d..1ea9cce8851723f02ec33126349c78135d2734db 100644 (file)
}
}
+
/***************
* Dialog handling
***************/
}
if($this->dialog instanceOf tabs){
- $this->dialog->save_object();
$display= $this->dialog->execute();
if($this->dialog->read_only == TRUE){
* List handling
***************/
+ // Check if there is a snapshot dialog open
+ $base = $this->DivListRoles->selectedBase;
+ if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases(),$this)){
+ return($str);
+ }
+
// Display dialog with group list
$this->DivListRoles->parent = $this;
$this->DivListRoles->execute();