From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 12 Jun 2007 05:21:33 +0000 (+0000)
Subject: Updated Copy & Paste for users
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ebac9cc4182bb5425873aebd91f2764ef57338f;p=gosa.git

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 b4327460a..9926c7f50 100644
--- 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 44cc6d01c..81cabc2fe 100644
--- 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;