X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fdepartments%2Fclass_departmentGeneric.inc;h=b3c8819e37d164da25dcdc2e26b0e6ed5a9ef8ee;hb=aef3764e59812f70fa8345505c4cdcf22bb4ebb0;hp=e928eda64ee3d47c2d341a1f2c5a47aee78d65e7;hpb=b50e7c6aa7358949fb20399b4ec9cb36376b9e7b;p=gosa.git

diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
index e928eda64..b3c8819e3 100644
--- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
@@ -244,11 +244,9 @@ class department extends plugin
 
 		/* All required fields are set? */
 		if ($this->ou == ""){
-			$message[]= _("Required field 'Name' is not set.");
 			$message[]= msgPool::required(_("Name"));
 		}
 		if ($this->description == ""){
-			$message[]= _("Required field 'Description' is not set.");
 			$message[]= msgPool::required(_("Description"));
 		}
 
@@ -314,33 +312,27 @@ class department extends plugin
     $this->skipTagging = TRUE;
     plugin::save();
 
+
     /* Remove tag information if needed */
-    if (!$this->is_administrational_unit){
+    if (!$this->is_administrational_unit && $this->initially_was_tagged){
       $tmp= array();
 
       /* Remove gosaAdministrativeUnit from this plugin */
+      $has_unit_tag= false;
       foreach($this->attrs['objectClass'] as $oc){
         if (!preg_match("/^gosaAdministrativeUnit$/i", $oc)){
           $tmp[]= $oc;
         }
+        if (preg_match("/^gosaAdministrativeUnitTag$/i", $oc)){
+          $has_unit_tag= true;
+        }
       }
       $this->attrs['objectClass']= $tmp;
-    }
-
-    /* Do we need to remove the tag itself? */
-    $has_unit_tag= false;
-    foreach($this->attrs['objectClass'] as $oc){
-      if (preg_match("/^gosaAdministrativeUnitTag$/i", $oc)){
-        $has_unit_tag= true;
-      }
-    }
-    if ($has_unit_tag == false && $this->is_administrational_unit == false){
       $this->attrs['gosaUnitTag']= array();
       $this->gosaUnitTag = "";
-    } else {
-      $this->attrs['gosaUnitTag']= $this->gosaUnitTag;
     }
 
+
 		/* Write back to ldap */
 		$ldap->cat($this->dn, array('dn'));
 		$ldap->cd($this->dn);
@@ -431,15 +423,17 @@ class department extends plugin
 			    return;
 		    }
 		    $this->handle_object_tagging($attrs['dn'], $this->gosaUnitTag, TRUE );
+        echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
 	    }
     }
     
     if(!$OnlySetTagFlag){
       $this->must_be_tagged = FALSE;
 	    echo '<p class="seperator">&nbsp;</p>';
-	    echo "<div style='width:100%;text-align:right;'><form name='form' method='post' action='?plug=".$_GET['plug']."' target='_parent'>
-		    <br><input type='submit' name='back' value='"._("Continue")."'>
-		    </form></div>";
+      echo "<div style='width:100%;text-align:right;'><form name='form' method='post' action='?plug=".$_GET['plug']."' target='_parent'>
+        <br><input type='submit' name='back' value='"._("Continue")."'>
+        </form></div>";
+      echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
     }
 	}
 
@@ -659,7 +653,47 @@ class department extends plugin
         @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "Not removing tag ($tag) $dn - seems to have moved away", "Tagging");
       }
     }
+  }
+
 
+  
+  /*! \brief    Returns a list of all available departments for this object.
+                If this object is new, all departments we are allowed to create a new user in are returned.
+                If this is an existing object, return all deps. we are allowed to move tis object too.
+
+      @return   Array [dn] => "..name"  // All deps. we are allowed to act on.
+  */
+  function get_allowed_bases()
+  {
+    $ui = get_userinfo();
+    $deps = array();
+
+    /* Is this a new object ? Or just an edited existing object */
+    if(!$this->initially_was_account && $this->is_account){
+      $new = true;
+    }else{
+      $new = false;
+    }
+
+    $ideps = $this->config->idepartments;
+    if(!isset($ideps[$this->base])){
+      $ideps[$this->base] = ".";
+    }
+    foreach($deps as $dn => $name){
+      if($new && $this->acl_is_createable($dn)){
+        $deps[$dn] = $name;
+      }elseif(!$new && $this->acl_is_moveable($dn)){
+        $deps[$dn] = $name;
+      }
+    }
+
+    /* Add current base */
+    if(isset($this->base) && isset($ideps[$this->base])){
+      $deps[$this->base] = $ideps[$this->base];
+    }else{
+      trigger_error("Cannot return list of departments, no default base found in class ".get_class($this).". ".$this->base);
+    }
+    return($deps);
   }
 
 }