From 5a8c2ffc39b0f51a8956a00b40daae79d27f1de8 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 5 May 2006 11:55:37 +0000 Subject: [PATCH] * Added basic support for tagging new objects There are a set of objects that cannot be handeled easily and have to be fixed: - fai (because of subentries) - addressbook (because of subentries) Additionaly create_missing_trees has to be adapted to write the tags of the parent node, too. * Updated TODO file git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3205 594d385d-05f5-0310-b6e9-bd551577e9d8 --- TODO | 22 +++++++++---------- .../admin/applications/tabs_application.inc | 3 +++ plugins/admin/fai/tabsHook.inc | 3 +++ plugins/admin/fai/tabsPackage.inc | 3 +++ plugins/admin/fai/tabsPartition.inc | 3 +++ plugins/admin/fai/tabsProfile.inc | 3 +++ plugins/admin/fai/tabsScript.inc | 3 +++ plugins/admin/fai/tabsTemplate.inc | 3 +++ plugins/admin/fai/tabsVariable.inc | 3 +++ plugins/admin/groups/tabs_group.inc | 7 +++++- plugins/admin/ogroups/tabs_ogroups.inc | 3 +++ plugins/admin/systems/tabs_component.inc | 3 +++ plugins/admin/systems/tabs_phone.inc | 3 +++ plugins/admin/systems/tabs_printers.inc | 3 +++ plugins/admin/systems/tabs_server.inc | 3 +++ plugins/admin/systems/tabs_terminal.inc | 2 ++ plugins/admin/systems/tabs_winstation.inc | 3 +++ plugins/admin/systems/tabs_workstation.inc | 2 ++ plugins/personal/generic/class_user.inc | 3 +++ 19 files changed, 65 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index cb68e5efa..c0eb1877e 100644 --- a/TODO +++ b/TODO @@ -1,15 +1,8 @@ Target for 2.4.1: ================= -* Sanity check for workstations/servers: repository server == self? - -* Can't remove phoneAccounts... - * Explaination of several FIXME's. Group removal, etc. -* peopleou, groupou, fai, etc. as department? Please check! - Check during login/setup? - * saveFilter added, please use! * Added functions normalizePreg and normalizeLdap. Please use where needed! @@ -17,14 +10,11 @@ Target for 2.4.1: * generatePasteIcon added, please use! * Create a status-bar/-display for FAI installations - (Use notes from 0.5.12.2005) * Add online help (english/german) + Document how to generate it, generate it and check it in -* Check virenschleuder/Winstations in Admin->Systems - LDAP-Error: Cannot modify object class (structural object class modification from 'person' to 'inetOrgPerson' not allowed) - -* Test DNS plugin. Add some more checks +* Fix DNS plugin. Add some more checks * Enhance the export xls to export the whole three with a maximum of attributes in each sheet ( OpenSides ) @@ -38,6 +28,14 @@ Target for 2.4.1: * Auto-Resize for subdialogs +* Fix create_missing_trees to gererate tags if needed, too + +* Fix fai objects to generate tags if needed (sub objects, phone me...) + +* Fix Phone book to generate tags if needed + +* Remove the refresh button from faiPackageNew (the second one) + Target for 2.5: =============== diff --git a/plugins/admin/applications/tabs_application.inc b/plugins/admin/applications/tabs_application.inc index d9c78dbd5..4d8eb2824 100644 --- a/plugins/admin/applications/tabs_application.inc +++ b/plugins/admin/applications/tabs_application.inc @@ -48,6 +48,9 @@ class apptabs extends tabs } tabs::save(); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/fai/tabsHook.inc b/plugins/admin/fai/tabsHook.inc index c16313fe2..c097e7afe 100644 --- a/plugins/admin/fai/tabsHook.inc +++ b/plugins/admin/fai/tabsHook.inc @@ -39,6 +39,9 @@ class tabsHook extends tabs $this->dn= $new_dn; tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/fai/tabsPackage.inc b/plugins/admin/fai/tabsPackage.inc index 21b2fb48b..44b99d69f 100644 --- a/plugins/admin/fai/tabsPackage.inc +++ b/plugins/admin/fai/tabsPackage.inc @@ -38,6 +38,9 @@ class tabsPackage extends tabs $this->dn= $new_dn; tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/fai/tabsPartition.inc b/plugins/admin/fai/tabsPartition.inc index c18779abe..5c44b82a7 100644 --- a/plugins/admin/fai/tabsPartition.inc +++ b/plugins/admin/fai/tabsPartition.inc @@ -39,6 +39,9 @@ class tabsPartition extends tabs $this->dn= $new_dn; tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/fai/tabsProfile.inc b/plugins/admin/fai/tabsProfile.inc index 3131a1dbe..a63ac9166 100644 --- a/plugins/admin/fai/tabsProfile.inc +++ b/plugins/admin/fai/tabsProfile.inc @@ -39,6 +39,9 @@ class tabsProfile extends tabs $this->dn= $new_dn; tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/fai/tabsScript.inc b/plugins/admin/fai/tabsScript.inc index 22a34d2c9..177e88a8e 100644 --- a/plugins/admin/fai/tabsScript.inc +++ b/plugins/admin/fai/tabsScript.inc @@ -39,6 +39,9 @@ class tabsScript extends tabs $this->dn= $new_dn; tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/fai/tabsTemplate.inc b/plugins/admin/fai/tabsTemplate.inc index 28851dbaf..142a4a581 100644 --- a/plugins/admin/fai/tabsTemplate.inc +++ b/plugins/admin/fai/tabsTemplate.inc @@ -39,6 +39,9 @@ class tabsTemplate extends tabs $this->dn= $new_dn; tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/fai/tabsVariable.inc b/plugins/admin/fai/tabsVariable.inc index c41a7f78c..e2b59917e 100644 --- a/plugins/admin/fai/tabsVariable.inc +++ b/plugins/admin/fai/tabsVariable.inc @@ -39,6 +39,9 @@ class tabsVariable extends tabs $this->dn= $new_dn; tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc index d970ec9ce..e45433942 100644 --- a/plugins/admin/groups/tabs_group.inc +++ b/plugins/admin/groups/tabs_group.inc @@ -65,7 +65,12 @@ class grouptabs extends tabs $this->dn= $new_dn; } - return tabs::save(); + $ret= tabs::save(); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); + + return $ret; } function saveCopyDialog() diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc index 3e4979224..9867ffdd2 100644 --- a/plugins/admin/ogroups/tabs_ogroups.inc +++ b/plugins/admin/ogroups/tabs_ogroups.inc @@ -224,6 +224,9 @@ class ogrouptabs extends tabs } tabs::save(); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/systems/tabs_component.inc b/plugins/admin/systems/tabs_component.inc index deead42af..597eadfbe 100644 --- a/plugins/admin/systems/tabs_component.inc +++ b/plugins/admin/systems/tabs_component.inc @@ -26,6 +26,9 @@ class componenttabs extends tabs } tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/systems/tabs_phone.inc b/plugins/admin/systems/tabs_phone.inc index 60ccd3305..742e2a001 100644 --- a/plugins/admin/systems/tabs_phone.inc +++ b/plugins/admin/systems/tabs_phone.inc @@ -26,6 +26,9 @@ class phonetabs extends tabs } tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/systems/tabs_printers.inc b/plugins/admin/systems/tabs_printers.inc index bb6a7ae86..2fe1c65db 100644 --- a/plugins/admin/systems/tabs_printers.inc +++ b/plugins/admin/systems/tabs_printers.inc @@ -44,6 +44,9 @@ class printtabs extends tabs } tabs::save(FALSE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/systems/tabs_server.inc b/plugins/admin/systems/tabs_server.inc index 12441a37e..9c87c84f2 100644 --- a/plugins/admin/systems/tabs_server.inc +++ b/plugins/admin/systems/tabs_server.inc @@ -32,6 +32,9 @@ class servtabs extends tabs $config= $_SESSION['config']; $config->load_servers(); $_SESSION['config']= $config; + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/systems/tabs_terminal.inc b/plugins/admin/systems/tabs_terminal.inc index 5f5e47eea..59f5dad25 100644 --- a/plugins/admin/systems/tabs_terminal.inc +++ b/plugins/admin/systems/tabs_terminal.inc @@ -53,6 +53,8 @@ class termtabs extends tabs $this->by_object['printgeneric']->remove_from_parent(); } + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/systems/tabs_winstation.inc b/plugins/admin/systems/tabs_winstation.inc index 062eac6ee..fdcb6e4e6 100644 --- a/plugins/admin/systems/tabs_winstation.inc +++ b/plugins/admin/systems/tabs_winstation.inc @@ -26,6 +26,9 @@ class wintabs extends tabs } tabs::save(TRUE); + + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/admin/systems/tabs_workstation.inc b/plugins/admin/systems/tabs_workstation.inc index ce5a65298..4afdf8333 100644 --- a/plugins/admin/systems/tabs_workstation.inc +++ b/plugins/admin/systems/tabs_workstation.inc @@ -49,6 +49,8 @@ class worktabs extends tabs $this->by_object['printgeneric']->remove_from_parent(); } + /* Fix tagging if needed */ + $baseobject->handle_object_tagging(); } } diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 0d7a91873..e7872c67f 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -921,6 +921,9 @@ class user extends plugin $this->handle_post_events("modify"); } + /* Fix tagging if needed */ + $this->handle_object_tagging(); + return (0); } -- 2.30.2