Updated group/apps closes #425

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

diff --git a/gosa-plugins/goto/admin/groups/apps/app_list.tpl b/gosa-plugins/goto/admin/groups/apps/app_list.tpl
index a21720b06993bc0a6f2a6337ac4450849861a96e..968887426f7cb352e942763c648d03b060d290b2 100644 (file)
--- a/gosa-plugins/goto/admin/groups/apps/app_list.tpl
+++ b/gosa-plugins/goto/admin/groups/apps/app_list.tpl
@@ -14,6 +14,7 @@
                        {else}
                                <input type='image' src='images/lists/paste-grey.png' class='center'>
                        {/if}
                        {else}
                                <input type='image' src='images/lists/paste-grey.png' class='center'>
                        {/if}

+                       <input type='image' src='images/lists/delete.png' class='center' name='menu_delete'>

                </td>
        </tr>
        {/if}
                </td>
        </tr>
        {/if}

diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
index 00f87bb5287539e360fb5c4c2979eb89c31834fb..54b1694442fdce83284ee2f02ad7b35abc01cb37 100644 (file)
--- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
+++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc
@@ -807,6 +807,11 @@ class appgroup extends plugin
         $this->copied_release = $this->FAIrelease;
         break;
       }
         $this->copied_release = $this->FAIrelease;
         break;
       }

+      if(preg_match("/^menu_delete/",$name)){
+        $current_rel  = $this->_get_release_key($this->FAIrelease); 
+        $this->_remove_entry_id($current_rel);
+        break;
+      }

       if(preg_match("/^menu_paste_/",$name)){
         $source_rel   = $this->_get_release_key($this->copied_release); 
         $current_rel  = $this->_get_release_key($this->FAIrelease);
       if(preg_match("/^menu_paste_/",$name)){
         $source_rel   = $this->_get_release_key($this->copied_release); 
         $current_rel  = $this->_get_release_key($this->FAIrelease);


@@ -819,6 +824,7 @@ class appgroup extends plugin
             $this->_add_entry($current_rel,$entry,-1);
           }
         }
             $this->_add_entry($current_rel,$entry,-1);
           }
         }

+        $this->copied_release = "";

         break;
       }
 
         break;
       }