Commit d9026b44777b2a02963573577ac41e5007a45f34
1 parent
780ea248
WSA-113
"Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8235 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
5 additions
and
5 deletions
ktapi/KTAPIDocument.inc.php
| ... | ... | @@ -1443,7 +1443,7 @@ class KTAPI_Document extends KTAPI_FolderItem |
| 1443 | 1443 | |
| 1444 | 1444 | } |
| 1445 | 1445 | |
| 1446 | - function get_permissions($document) | |
| 1446 | + function get_permission_string($document) | |
| 1447 | 1447 | { |
| 1448 | 1448 | $perms = 'R'; |
| 1449 | 1449 | if (Permission::userHasDocumentWritePermission($document)) |
| ... | ... | @@ -1605,7 +1605,7 @@ class KTAPI_Document extends KTAPI_FolderItem |
| 1605 | 1605 | $detail['is_immutable'] = (bool) $document->getImmutable(); |
| 1606 | 1606 | |
| 1607 | 1607 | // check permissions |
| 1608 | - $detail['permissions'] = KTWSAPI_Document::get_permissions($document); | |
| 1608 | + $detail['permissions'] = KTWSAPI_Document::get_permission_string($document); | |
| 1609 | 1609 | |
| 1610 | 1610 | // get workflow name |
| 1611 | 1611 | $workflowid = $document->getWorkflowId(); | ... | ... |
ktapi/KTAPIFolder.inc.php
| ... | ... | @@ -321,7 +321,7 @@ class KTAPI_Folder extends KTAPI_FolderItem |
| 321 | 321 | return $user; |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | - function get_permissions($folder) | |
| 324 | + function get_permission_string($folder) | |
| 325 | 325 | { |
| 326 | 326 | $perms = 'R'; |
| 327 | 327 | if (Permission::userHasFolderWritePermission($folder)) |
| ... | ... | @@ -399,7 +399,7 @@ class KTAPI_Folder extends KTAPI_FolderItem |
| 399 | 399 | 'version' => 'n/a', |
| 400 | 400 | |
| 401 | 401 | 'is_immutable'=> 'n/a', |
| 402 | - 'permissions' => KTWSAPI_Folder::get_permissions($folder), | |
| 402 | + 'permissions' => KTWSAPI_Folder::get_permission_string($folder), | |
| 403 | 403 | |
| 404 | 404 | 'workflow'=>'n/a', |
| 405 | 405 | 'workflow_state'=>'n/a', |
| ... | ... | @@ -533,7 +533,7 @@ class KTAPI_Folder extends KTAPI_FolderItem |
| 533 | 533 | 'version' => $document->getMajorVersionNumber() . '.' . $document->getMinorVersionNumber(), |
| 534 | 534 | |
| 535 | 535 | 'is_immutable'=> $document->getImmutable()?'true':'false', |
| 536 | - 'permissions' => KTWSAPI_Document::get_permissions($document), | |
| 536 | + 'permissions' => KTWSAPI_Document::get_permission_string($document), | |
| 537 | 537 | |
| 538 | 538 | 'workflow'=> $workflow, |
| 539 | 539 | 'workflow_state'=> $state, | ... | ... |