Peter M. Groen / knowledgetree

Commit 8bca9efd12ac2b29b4196ced0e028b4cf49b4e1d

Authored by Megan Watson
1 parent b11bb18b

KTS-3522 

"documents permission"
Fixed. The documents in the direct folder weren't being updated only the subfolders and their contained documents.

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9003 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 14 additions and 12 deletions
lib/permissions/permissionutil.inc.php
  View file @8bca9ef
@@ -6,31 +6,31 @@ @@ -6,31 +6,31 @@
6 * Document Management Made Simple 6 * Document Management Made Simple
7 * Copyright (C) 2008 KnowledgeTree Inc. 7 * Copyright (C) 2008 KnowledgeTree Inc.
8 * Portions copyright The Jam Warehouse Software (Pty) Limited 8 * Portions copyright The Jam Warehouse Software (Pty) Limited
9 - * 9 + *
10 * This program is free software; you can redistribute it and/or modify it under 10 * This program is free software; you can redistribute it and/or modify it under
11 * the terms of the GNU General Public License version 3 as published by the 11 * the terms of the GNU General Public License version 3 as published by the
12 * Free Software Foundation. 12 * Free Software Foundation.
13 - * 13 + *
14 * This program is distributed in the hope that it will be useful, but WITHOUT 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17 * details. 17 * details.
18 - * 18 + *
19 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
20 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21 - *  
22 - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 21 + *
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
23 * California 94120-7775, or email info@knowledgetree.com. 23 * California 94120-7775, or email info@knowledgetree.com.
24 - * 24 + *
25 * The interactive user interfaces in modified source and object code versions 25 * The interactive user interfaces in modified source and object code versions
26 * of this program must display Appropriate Legal Notices, as required under 26 * of this program must display Appropriate Legal Notices, as required under
27 * Section 5 of the GNU General Public License version 3. 27 * Section 5 of the GNU General Public License version 3.
28 - * 28 + *
29 * In accordance with Section 7(b) of the GNU General Public License version 3, 29 * In accordance with Section 7(b) of the GNU General Public License version 3,
30 * these Appropriate Legal Notices must retain the display of the "Powered by 30 * these Appropriate Legal Notices must retain the display of the "Powered by
31 - * KnowledgeTree" logo and retain the original copyright notice. If the display of the 31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices 32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
33 - * must display the words "Powered by KnowledgeTree" and retain the original 33 + * must display the words "Powered by KnowledgeTree" and retain the original
34 * copyright notice. 34 * copyright notice.
35 * Contributor( s): ______________________________________ 35 * Contributor( s): ______________________________________
36 * 36 *
@@ -304,11 +304,11 @@ class KTPermissionUtil { @@ -304,11 +304,11 @@ class KTPermissionUtil {
304 $is_a_folder = is_a($oFolderOrDocument, 'Folder'); 304 $is_a_folder = is_a($oFolderOrDocument, 'Folder');
305 $is_a_document = is_a($oFolderOrDocument, 'Document') || is_a($oFolderOrDocument, 'KTDocumentCore'); 305 $is_a_document = is_a($oFolderOrDocument, 'Document') || is_a($oFolderOrDocument, 'KTDocumentCore');
306 306
307 - //ensure that the document shortcut is being updated. 307 + //ensure that the document shortcut is being updated.
308 if($is_a_document && $oFolderOrDocument->isSymbolicLink()){ 308 if($is_a_document && $oFolderOrDocument->isSymbolicLink()){
309 $oFolderOrDocument->switchToRealCore(); 309 $oFolderOrDocument->switchToRealCore();
310 } 310 }
311 - 311 +
312 $oChannel = null; 312 $oChannel = null;
313 $aMapPermAllowed = null; 313 $aMapPermAllowed = null;
314 $oPermLookup = null; 314 $oPermLookup = null;
@@ -731,9 +731,11 @@ class KTPermissionUtil { @@ -731,9 +731,11 @@ class KTPermissionUtil {
731 731
732 Folder::clearAllCaches(); 732 Folder::clearAllCaches();
733 733
  734 + // Update all documents in the folder and in the sub-folders
734 $sQuery = "UPDATE $default->documents_table SET 735 $sQuery = "UPDATE $default->documents_table SET
735 permission_object_id = ? WHERE permission_object_id = ? AND 736 permission_object_id = ? WHERE permission_object_id = ? AND
736 - parent_folder_ids LIKE ?"; 737 + (parent_folder_ids LIKE ? OR folder_id = ?)";
  738 + $aParams[] = $iFolderID;
737 DBUtil::runQuery(array($sQuery, $aParams)); 739 DBUtil::runQuery(array($sQuery, $aParams));
738 740
739 Document::clearAllCaches(); 741 Document::clearAllCaches();