Peter M. Groen / knowledgetree

Commit bbc5c96c353e4a7738d28b934914a40b9aeacf71

Authored by kevin_fourie
1 parent 0ead8000

Merged in from DEV trunk... 

KTS-2601
"Create indexer administration page"
Updated. Fixed Typo.

Committed By: Conrad Vermeulen
Reviewed By: Jonathan Byrne

KTS-3178
"Checking for write permission doesn't check if document is immutable. if immutable, user cannot have write access."
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Martin Kirsten


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8275 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 7 additions and 1 deletions
lib/security/Permission.inc
  View file @bbc5c96
@@ -53,6 +53,12 @@ class Permission { @@ -53,6 +53,12 @@ class Permission {
53 * @return boolean true if the current user has document write permission, false otherwise and set $_SESSION["errorMessage"] 53 * @return boolean true if the current user has document write permission, false otherwise and set $_SESSION["errorMessage"]
54 */ 54 */
55 function userHasDocumentWritePermission($oDocument) { 55 function userHasDocumentWritePermission($oDocument) {
  56 +
  57 + if ($oDocument->getImmutable())
  58 + {
  59 + return false;
  60 + }
  61 +
56 $oUser = User::get($_SESSION["userID"]); 62 $oUser = User::get($_SESSION["userID"]);
57 $oPermission = KTPermission::getByName('ktcore.permissions.write'); 63 $oPermission = KTPermission::getByName('ktcore.permissions.write');
58 64
plugins/search2/reporting/templates/rescheduledocuments.smarty
  View file @bbc5c96
1 <h2>{i18n}Reschedule All Documents{/i18n}</h2> 1 <h2>{i18n}Reschedule All Documents{/i18n}</h2>
2 <p class="descriptiveText">{i18n}This function allows you to re-index your entire repository.{/i18n}</p> 2 <p class="descriptiveText">{i18n}This function allows you to re-index your entire repository.{/i18n}</p>
3 -<p class="descriptiveText">{i18n}Please note that rescheduling all documents may take a long time, depending on the size if the repository.{/i18n}</h3> 3 +<p class="descriptiveText">{i18n}Please note that rescheduling all documents may take a long time, depending on the size of the repository.{/i18n}</h3>
4 4
5 <form name="rescheduleAllDocs" action="{$smarty.server.PHP_SELF}" method="POST"> 5 <form name="rescheduleAllDocs" action="{$smarty.server.PHP_SELF}" method="POST">
6 <br> 6 <br>