Updated Copy & Paste for users

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

diff --git a/ihtml/themes/default/copyPasteDialog.tpl b/ihtml/themes/default/copyPasteDialog.tpl
index b4327460a93938d6e4bf03e256e958b1c314e682..9926c7f50afb3b3871d0a01daeb4b3669acff893 100644 (file)
--- a/ihtml/themes/default/copyPasteDialog.tpl
+++ b/ihtml/themes/default/copyPasteDialog.tpl
@@ -17,11 +17,11 @@
 
        <div style='text-align:right;width:100%;'>
                <input type='submit' name='PerformCopyPaste' value='{t}Save{/t}'>&nbsp;
+       {if $type == "copy"}
                <input type='submit' name='abort_current_cut-copy_operation' value='{t}Cancel{/t}'>
+       {/if}
        
-       {if $type == "copy"}
                <input type='submit' name='abort_all_cut-copy_operations' value='{t}Cancel all{/t}'>
-       {/if}
        </div>
        {/if}
 {else}

diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 44cc6d01cff9b9d5ddc80cad35bdaf8738f08051..81cabc2fe4f2014a2cca5570d80af49cee04618f 100644 (file)
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -151,7 +151,7 @@ class CopyPasteHandler {
   /* Check if there are still entries the object queue */
   function entries_queued()
   {
-    return( count($this->queue) >=1);
+    return( count($this->queue) >=1 || $this->current != FALSE);
   }
 
 
@@ -271,13 +271,13 @@ class CopyPasteHandler {
     }
     if($type == "copy"){
       if(isset($_POST['PerformCopyPaste'])){
+        $this->_update_vars();
         $msgs = $this->check();
         if(count ($msgs) ){
           foreach( $msgs as $msg){
             print_red($msg);
           }
         }else{
-          $this->_update_vars();
           $this->current['object']->save();
           $this->lastdn = $this->current['object']->dn;
           $this->current =FALSE;