Peter M. Groen / knowledgetree

Commit 40088d7cee60fc92ef5dcc7ffe57b5835866863e

Authored by kevin_fourie
1 parent e41eadff

Merged in from STABLE trunk... 

KTC-529
"Conflicting messages when attempting to cancel the checkout for a document via the KnowledgeTree web interface."
Fixed. Added return url to folder on the collectinfo step.

Committed by: Megan Watson
Reviewed by: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9200 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 15 additions and 5 deletions
plugins/ktcore/KTBulkActions.php
  View file @40088d7
... ... @@ -62,6 +62,8 @@ class KTBulkDeleteAction extends KTBulkAction {
62 62 }
63 63  
64 64 function form_collectinfo() {
  65 + $cancelUrl = KTBrowseUtil::getUrlForFolder($this->oFolder);
  66 +
65 67 $oForm = new KTForm;
66 68 $oForm->setOptions(array(
67 69 'identifier' => 'ktcore.actions.bulk.delete.form',
... ... @@ -69,7 +71,7 @@ class KTBulkDeleteAction extends KTBulkAction {
69 71 'submit_label' => _kt('Delete'),
70 72 'action' => 'performaction',
71 73 'fail_action' => 'collectinfo',
72   - 'cancel_action' => 'main',
  74 + 'cancel_url' => $cancelUrl,
73 75 'context' => $this,
74 76 ));
75 77 $oForm->setWidgets(array(
... ... @@ -195,6 +197,8 @@ class KTBulkMoveAction extends KTBulkAction {
195 197 }
196 198  
197 199 function form_collectinfo() {
  200 + $cancelUrl = KTBrowseUtil::getUrlForFolder($this->oFolder);
  201 +
198 202 $oForm = new KTForm;
199 203 $oForm->setOptions(array(
200 204 'identifier' => 'ktcore.actions.bulk.move.form',
... ... @@ -202,7 +206,7 @@ class KTBulkMoveAction extends KTBulkAction {
202 206 'submit_label' => _kt('Move'),
203 207 'action' => 'performaction',
204 208 'fail_action' => 'collectinfo',
205   - 'cancel_action' => 'main',
  209 + 'cancel_url' => $cancelUrl,
206 210 'context' => $this,
207 211 ));
208 212  
... ... @@ -339,6 +343,8 @@ class KTBulkCopyAction extends KTBulkAction {
339 343 }
340 344  
341 345 function form_collectinfo() {
  346 + $cancelUrl = KTBrowseUtil::getUrlForFolder($this->oFolder);
  347 +
342 348 $oForm = new KTForm;
343 349 $oForm->setOptions(array(
344 350 'identifier' => 'ktcore.actions.bulk.copy.form',
... ... @@ -346,7 +352,7 @@ class KTBulkCopyAction extends KTBulkAction {
346 352 'submit_label' => _kt('Copy'),
347 353 'action' => 'performaction',
348 354 'fail_action' => 'collectinfo',
349   - 'cancel_action' => 'main',
  355 + 'cancel_url' => $cancelUrl,
350 356 'context' => $this,
351 357 ));
352 358  
... ... @@ -483,6 +489,8 @@ class KTBulkArchiveAction extends KTBulkAction {
483 489 }
484 490  
485 491 function form_collectinfo() {
  492 + $cancelUrl = KTBrowseUtil::getUrlForFolder($this->oFolder);
  493 +
486 494 $oForm = new KTForm;
487 495 $oForm->setOptions(array(
488 496 'identifier' => 'ktcore.actions.bulk.archive.form',
... ... @@ -490,7 +498,7 @@ class KTBulkArchiveAction extends KTBulkAction {
490 498 'submit_label' => _kt('Archive'),
491 499 'action' => 'performaction',
492 500 'fail_action' => 'collectinfo',
493   - 'cancel_action' => 'main',
  501 + 'cancel_url' => $cancelUrl,
494 502 'context' => $this,
495 503 ));
496 504  
... ... @@ -904,6 +912,8 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
904 912 }
905 913  
906 914 function form_collectinfo() {
  915 + $cancelUrl = KTBrowseUtil::getUrlForFolder($this->oFolder);
  916 +
907 917 $oForm = new KTForm;
908 918 $oForm->setOptions(array(
909 919 'identifier' => 'ktcore.actions.bulk.checkout.form',
... ... @@ -911,7 +921,7 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
911 921 'submit_label' => _kt('Checkout'),
912 922 'action' => 'performaction',
913 923 'fail_action' => 'collectinfo',
914   - 'cancel_action' => 'main',
  924 + 'cancel_url' => $cancelUrl,
915 925 'context' => $this,
916 926 ));
917 927  
... ...