From: hickert Date: Mon, 9 Nov 2009 10:18:50 +0000 (+0000) Subject: Updated application management X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c399f058e82ecb1ea418d4c6101840e9f7423c53;p=gosa.git Updated application management git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14797 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/goto/admin/applications/application-filter.tpl b/gosa-plugins/goto/admin/applications/application-filter.tpl index d8c1b1235..8f83a74b4 100644 --- a/gosa-plugins/goto/admin/applications/application-filter.tpl +++ b/gosa-plugins/goto/admin/applications/application-filter.tpl @@ -7,7 +7,6 @@
- {$SCOPE} diff --git a/gosa-plugins/goto/admin/applications/application-filter.xml b/gosa-plugins/goto/admin/applications/application-filter.xml index 859d79b05..4ef15f4a7 100644 --- a/gosa-plugins/goto/admin/applications/application-filter.xml +++ b/gosa-plugins/goto/admin/applications/application-filter.xml @@ -16,7 +16,7 @@ cndescription - auto + one diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc index 50422805d..93122037a 100644 --- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc +++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc @@ -51,13 +51,13 @@ class applicationManagement extends management $this->storagePoints= array(get_ou("applicationRDN")); } - // Build filter - if (session::global_is_set(get_class($this)."_filter")){ - $filter= session::global_get(get_class($this)."_filter"); - } else { +# // Build filter +# if (session::global_is_set(get_class($this)."_filter")){ +# $filter= session::global_get(get_class($this)."_filter"); +# } else { $filter = new filter(get_template_path($filter_xml, true)); $filter->setObjectStorage($this->storagePoints); - } +# } $this->setFilter($filter); // Build headpage @@ -91,10 +91,10 @@ class applicationManagement extends management } $headpage->setBase($this->app_release); } + $headpage->update(); $display = $headpage->render(); return($this->getHeader().$display); - } function getReleaseList($base = "", $prefix ="") @@ -117,6 +117,8 @@ class applicationManagement extends management function IsReleaseManagementActivated() { + return(FALSE); + /* Check if we should enable the release selection */ $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs')); if(!empty($tmp)){ diff --git a/gosa-plugins/goto/admin/applications/remove.tpl b/gosa-plugins/goto/admin/applications/remove.tpl index 7735c280e..29adedf1b 100644 --- a/gosa-plugins/goto/admin/applications/remove.tpl +++ b/gosa-plugins/goto/admin/applications/remove.tpl @@ -3,7 +3,7 @@

{$info} - {t}This may be a primary user group. Please double check if you really want to do this since there is no way for GOsa to get your data back.{/t} + {t}Please double check if you really want to do this since there is no way for GOsa to get your data back.{/t}

diff --git a/gosa-plugins/goto/admin/applications/tabs_application.inc b/gosa-plugins/goto/admin/applications/tabs_application.inc index 21891310a..b9373aeaf 100644 --- a/gosa-plugins/goto/admin/applications/tabs_application.inc +++ b/gosa-plugins/goto/admin/applications/tabs_application.inc @@ -32,17 +32,13 @@ class apptabs extends tabs }else{ $new_dn= "cn=".$baseobject->cn.",".get_ou('applicationRDN').$baseobject->base; } - - /* Move group? */ + + // Do we have to move the object? if ($this->dn != $new_dn){ - - /* Write entry on new 'dn' */ if ($this->dn != "new"){ $baseobject->move($this->dn, $new_dn); $this->by_object['application']= $baseobject; } - - /* Happen to use the new one */ $this->dn= $new_dn; }