* Changed text in device type selection

* Added iframe output to handle_object_tagging

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

diff --git a/TODO b/TODO
index 0ef0fcfb79c57b24b4dda453358ea669327f0649..0f4f3978e2b7537aa8223a06657b305c54a57bd5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -31,12 +31,10 @@ Target for 2.4.1:
 
 
 Now:
-* Add iframe progress for departments when handling tagging
 * evaluate what effects a ldap->cat(..., $this->attributes)
   will have to other plugins in class_plugin.inc
 * Enhance show_ldap_error() with an additional programmer supplied message
-* Changing LDAP-Servers -> start tab!
-* Subsearches for user dialogs
+* Changing LDAP-Servers -> start tab! Actions?
 
 
 Target for 2.5:

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index b2428de68e9f138bf0578f9ad7c5e6eb4ee37b36..6a700502ea68c84ca87df43a97e70b7a1ea354e8 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -905,11 +905,12 @@ class plugin
       $ldap->cat($dn, array('gosaUnitTag', 'objectClass'));
       $attrs= $ldap->fetch();
       if(isset($attrs['gosaUnitTag'][0]) && $attrs['gosaUnitTag'][0] == $tag){
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "$dn is already tagged", "Tagging");
+        echo sprintf(_("Processing: Object '%s' is already tagged"), $dn);
+        flush()
         return;
       }
       if (count($attrs)){
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "Add tagging ($tag) to $dn", "Tagging");
+        echo sprintf(_("Processing: Adding tag (%s) to object '%s'"), $dn);
         $nattrs= array("gosaUnitTag" => $this->gosaUnitTag);
         $nattrs['objectClass']= array();
         for ($i= 0; $i<$attrs['objectClass']['count']; $i++){
@@ -935,7 +936,7 @@ class plugin
         return;
       }
       if (count($attrs)){
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "Remove tagging from $dn", "Tagging");
+        echo sprintf(_("Processing: Removing tag from object '%s'"), $dn);
         $nattrs= array("gosaUnitTag" => array());
         $nattrs['objectClass']= array();
         for ($i= 0; $i<$attrs['objectClass']['count']; $i++){

diff --git a/plugins/admin/systems/SelectDeviceType.tpl b/plugins/admin/systems/SelectDeviceType.tpl
index a051fb2ead53cdcc92a1e9b40db76186ee57a9e6..a868541d2e8a3675f3b7a1e01179a0af15a32d88 100644 (file)
--- a/plugins/admin/systems/SelectDeviceType.tpl
+++ b/plugins/admin/systems/SelectDeviceType.tpl
@@ -29,7 +29,7 @@
    <table summary="">
     <tr>
      <td> 
-      {t}Inherit settings from this object group{/t}&nbsp;
+      {t}Choose a template group{/t}&nbsp;
          <select name="ObjectGroup" title="{t}Choose an object group{/t}" style="width:120px;">
        {html_options values=$ObjectGroupKeys output=$ObjectGroups selected=$ObjectGroup}
       </select>