From 567d2dbe96e361b0d21d7e269f7b2e6a599a392e Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 18 Nov 2005 05:33:39 +0000 Subject: [PATCH] Removed lock message new git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1961 594d385d-05f5-0310-b6e9-bd551577e9d8 --- TODO | 3 --- plugins/admin/fai/class_faiHook.inc | 6 ++++-- plugins/admin/fai/class_faiPartitionTable.inc | 6 +++++- plugins/admin/fai/class_faiScript.inc | 6 +++++- plugins/admin/fai/class_faiTemplate.inc | 6 +++++- plugins/admin/fai/class_faiVariable.inc | 6 +++++- plugins/admin/groups/class_groupApplication.inc | 15 ++++++++++++--- 7 files changed, 36 insertions(+), 12 deletions(-) diff --git a/TODO b/TODO index 8d3be8221..0aae7fc68 100644 --- a/TODO +++ b/TODO @@ -6,9 +6,6 @@ Things to fix before 2.4: * Rework dialog to add aplications (group dialog) -* There are still several "Lock new" hints in FAI plugin - headers - * First name/Last name instead of Name/Given name * Evaluate patches for certificate generation diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc index 2b5069290..0bf06a67c 100644 --- a/plugins/admin/fai/class_faiHook.inc +++ b/plugins/admin/fai/class_faiHook.inc @@ -92,8 +92,10 @@ class faiHook extends plugin $this->dialog= new $this->subClassName($this->config,"new"); $this->is_dialog=true; } - - $_SESSION['objectinfo']= $this->dn; + + if($this->dn != "new"){ + $_SESSION['objectinfo']= $this->dn; + } /* Edit selected Sub Object */ if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){ $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$_POST['SubObject']]); diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc index ca107408b..fc35fd188 100644 --- a/plugins/admin/fai/class_faiPartitionTable.inc +++ b/plugins/admin/fai/class_faiPartitionTable.inc @@ -100,7 +100,11 @@ class faiPartitionTable extends plugin /* Edit disk. * Open dialog which allows us to edit the selected entry */ - $_SESSION['objectinfo'] = $this->dn; + + if($this->dn != "new"){ + $_SESSION['objectinfo']= $this->dn; + } + if((isset($_POST['EditDisk']))&&(isset($_POST['disks']))){ $usedDiskNames =array(); foreach($this->disks as $key=>$disk){ diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc index 61e3968ca..bd2ebf893 100644 --- a/plugins/admin/fai/class_faiScript.inc +++ b/plugins/admin/fai/class_faiScript.inc @@ -95,7 +95,11 @@ class faiScript extends plugin $this->is_dialog=true; } - $_SESSION['objectinfo'] = $this->dn; + if($this->dn != "new"){ + $_SESSION['objectinfo']= $this->dn; + } + + /* Edit selected Sub Object */ if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){ $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$_POST['SubObject']]); diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc index ed4eb8a82..0ead84015 100644 --- a/plugins/admin/fai/class_faiTemplate.inc +++ b/plugins/admin/fai/class_faiTemplate.inc @@ -91,7 +91,11 @@ class faiTemplate extends plugin $this->is_dialog=true; } - $_SESSION['objectinfo'] = $this->dn; + if($this->dn != "new"){ + $_SESSION['objectinfo']= $this->dn; + } + + /* Edit selected Sub Object */ if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){ $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$_POST['SubObject']]); diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc index ff1ca9c05..fdf650198 100644 --- a/plugins/admin/fai/class_faiVariable.inc +++ b/plugins/admin/fai/class_faiVariable.inc @@ -89,7 +89,11 @@ class faiVariable extends plugin $this->is_dialog=true; } - $_SESSION['objectinfo'] = $this->dn; + if($this->dn != "new"){ + $_SESSION['objectinfo']= $this->dn; + } + + /* Edit selected Sub Object */ if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){ $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$_POST['SubObject']]); diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index a73092b23..5131abcd5 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -18,10 +18,7 @@ class appgroup extends plugin var $option_value= array(); var $appoption= array(); var $table= ""; - var $curbase = ""; - - var $curCatDir; var $curCatDepth=0; var $Categories=array(); @@ -73,6 +70,18 @@ class appgroup extends plugin $this->curbase = $this->config->current['BASE']; } + function getOneUp($prio) + { + + + } + + function getOneDown(){ + + + } + + function execute() { /* Call parent execute */ -- 2.30.2