Peter M. Groen / knowledgetree

Commit a9e367d9e8dc38b1fdc9b35d03fbffc0ae647a6a

Authored by bshuttle
1 parent e9f78509

- un-break comparison viewing 

- make document-permissions an "info" item.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5852 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 11 additions and 5 deletions
plugins/ktcore/KTCorePlugin.php
  View file @a9e367d
... ... @@ -72,7 +72,7 @@ class KTCorePlugin extends KTPlugin {
72 72  
73 73  
74 74 // Permissions
75   - $this->registerAction('documentaction', 'KTDocumentPermissionsAction', 'ktcore.actions.document.permissions', 'KTPermissions.php');
  75 + $this->registerAction('documentinfo', 'KTDocumentPermissionsAction', 'ktcore.actions.document.permissions', 'KTPermissions.php');
76 76 $this->registerAction('folderaction', 'KTRoleAllocationPlugin', 'ktcore.actions.folder.roles', 'KTPermissions.php');
77 77 $this->registerAction('documentinfo', 'KTDocumentRolesAction', 'ktcore.actions.document.roles', 'KTPermissions.php');
78 78  
... ...
plugins/ktcore/KTDocumentActions.php
  View file @a9e367d
... ... @@ -174,12 +174,18 @@ class KTDocumentVersionHistoryAction extends KTDocumentAction {
174 174 function do_viewComparison() {
175 175 // this is just a redirector
176 176 $QS = array(
177   - 'action' => 'startComparison',
178   - 'fDocumentId' => urlencode($this->oDocument->getId()),
179   - 'fComparisonVersion' => urlencode($_REQUEST['fComparisonVersion']),
  177 + 'action' => 'viewComparison',
  178 + 'fDocumentId' => $this->oDocument->getId(),
  179 + 'fComparisonVersion' => $_REQUEST['fComparisonVersion'],
180 180 );
181 181  
182   - redirect(KTUtil::ktLink('view.php',null,implode('&', $QS)));
  182 + $frag = array();
  183 +
  184 + foreach ($QS as $k => $v) {
  185 + $frag[] = sprintf("%s=%s", urlencode($k), urlencode($v));
  186 + }
  187 +
  188 + redirect(KTUtil::ktLink('view.php',null,implode('&', $frag)));
183 189 }
184 190  
185 191  
... ...