Updated license usage dialog.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14351 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc
index fda4c732c2abd5bcd4ddd9f104aaa2cf1f301581..01e2af03193c1f9bbc709c8f1c07e61fb04de8af 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc
@@ -44,7 +44,7 @@ class licenseUsage extends plugin
     }
 
     // Extract pool name out of the fake dn.
-#    $this->init();
+    $this->init();
   }
 
   
@@ -128,34 +128,7 @@ class licenseUsage extends plugin
 
   /* Saves object modifications
    */  
-  function save()
-  {
-    plugin::save();
-
-    // Send modify/add events
-    $mode = "modify";
-    if($this->orig_dn == "new"){
-      $mode = "add";
-    }
-
-    $this->si->createPool($this->cn, $this->description,$this->productIds,$this->softwareIds);#
-    if($this->si->is_error()){
-      msg_dialog::display(_("Error"),msgPool::siError($this->si->get_error()),ERROR_DIALOG);
-    }else{
-      $this->handle_post_events($mode);
-    }
-
-    // Log action
-    if($mode == "modify"){
-      new log("modify","users/".get_class($this),$this->dn,array_keys($this->attrs),$this->si->get_error());
-    }else{
-      new log("create","users/".get_class($this),$this->dn,array_keys($this->attrs),$this->si->get_error());
-    }
-
-    return 0;
-  }
-
- 
+  function save() { }
   function remove_from_parent(){ return; }
 
  

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc
index 284e80799f967406166922d2f58fc2f93fd65828..3b855423217e01de616682d33767be54826870cc 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc
@@ -221,8 +221,8 @@ class opsiLicenceHandler extends opsi  {
       $data['licensePoolId'] = htmlentities($licensePoolId);
     }
 
-    $res = $this->send_data("gosa_opsi_getSoftwareLicenseUsages_listOfHashes",$this->target,$data,TRUE);
-    if(isset($res['XML'][0]['ANSWER_OPSI_GETSOFTWARELICENSEUSAGES_LISTOFHASHES'])){
+    $res = $this->send_data("gosa_opsi_getSoftwareLicenseUsages",$this->target,$data,TRUE);
+    if(isset($res['XML'][0]['ANSWER_OPSI_GETSOFTWARELICENSEUSAGES'])){
 
       $items = array();
       foreach($res['XML'][0]['RESULT'][0]['HIT'] as $entry){