Commit bdd5f2413c44d686b4605fc2ae49725cbfff4e2a
1 parent
053b60bd
WSA-93
"Add integration/oem no so that integrators may associate a custom document reference" Implemented. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7870 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
19 additions
and
11 deletions
lib/documentmanagement/Document.inc
| @@ -5,32 +5,32 @@ | @@ -5,32 +5,32 @@ | ||
| 5 | * KnowledgeTree Open Source Edition | 5 | * KnowledgeTree Open Source Edition |
| 6 | * Document Management Made Simple | 6 | * Document Management Made Simple |
| 7 | * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited | 7 | * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited |
| 8 | - * | 8 | + * |
| 9 | * This program is free software; you can redistribute it and/or modify it under | 9 | * This program is free software; you can redistribute it and/or modify it under |
| 10 | * the terms of the GNU General Public License version 3 as published by the | 10 | * the terms of the GNU General Public License version 3 as published by the |
| 11 | * Free Software Foundation. | 11 | * Free Software Foundation. |
| 12 | - * | 12 | + * |
| 13 | * This program is distributed in the hope that it will be useful, but WITHOUT | 13 | * This program is distributed in the hope that it will be useful, but WITHOUT |
| 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
| 15 | * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | 15 | * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more |
| 16 | * details. | 16 | * details. |
| 17 | - * | 17 | + * |
| 18 | * You should have received a copy of the GNU General Public License | 18 | * You should have received a copy of the GNU General Public License |
| 19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 20 | - * | 20 | + * |
| 21 | * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, | 21 | * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, |
| 22 | * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. | 22 | * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. |
| 23 | - * | 23 | + * |
| 24 | * The interactive user interfaces in modified source and object code versions | 24 | * The interactive user interfaces in modified source and object code versions |
| 25 | * of this program must display Appropriate Legal Notices, as required under | 25 | * of this program must display Appropriate Legal Notices, as required under |
| 26 | * Section 5 of the GNU General Public License version 3. | 26 | * Section 5 of the GNU General Public License version 3. |
| 27 | - * | 27 | + * |
| 28 | * In accordance with Section 7(b) of the GNU General Public License version 3, | 28 | * In accordance with Section 7(b) of the GNU General Public License version 3, |
| 29 | * these Appropriate Legal Notices must retain the display of the "Powered by | 29 | * these Appropriate Legal Notices must retain the display of the "Powered by |
| 30 | - * KnowledgeTree" logo and retain the original copyright notice. If the display of the | 30 | + * KnowledgeTree" logo and retain the original copyright notice. If the display of the |
| 31 | * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices | 31 | * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices |
| 32 | - * must display the words "Powered by KnowledgeTree" and retain the original | ||
| 33 | - * copyright notice. | 32 | + * must display the words "Powered by KnowledgeTree" and retain the original |
| 33 | + * copyright notice. | ||
| 34 | * Contributor( s): ______________________________________ | 34 | * Contributor( s): ______________________________________ |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| @@ -107,6 +107,8 @@ class Document { | @@ -107,6 +107,8 @@ class Document { | ||
| 107 | function getRestoreFolderPath() { return $this->_oDocumentCore->getRestoreFolderPath(); } | 107 | function getRestoreFolderPath() { return $this->_oDocumentCore->getRestoreFolderPath(); } |
| 108 | function setRestoreFolderPath($sValue) { $this->_oDocumentCore->setRestoreFolderPath($sValue); } | 108 | function setRestoreFolderPath($sValue) { $this->_oDocumentCore->setRestoreFolderPath($sValue); } |
| 109 | 109 | ||
| 110 | + function getOemNo() { return $this->_oDocumentCore->getOemNo(); } | ||
| 111 | + | ||
| 110 | 112 | ||
| 111 | // Document Metadata Items | 113 | // Document Metadata Items |
| 112 | 114 | ||
| @@ -610,6 +612,7 @@ class Document { | @@ -610,6 +612,7 @@ class Document { | ||
| 610 | 612 | ||
| 611 | function clearAllCaches() { | 613 | function clearAllCaches() { |
| 612 | 614 | ||
| 615 | + $GLOBALS["_OBJECTCACHE"]['Document'] = array(); | ||
| 613 | KTEntityUtil::clearAllCaches('KTDocumentCore'); | 616 | KTEntityUtil::clearAllCaches('KTDocumentCore'); |
| 614 | KTEntityUtil::clearAllCaches('KTDocumentContentVersion'); | 617 | KTEntityUtil::clearAllCaches('KTDocumentContentVersion'); |
| 615 | KTEntityUtil::clearAllCaches('KTDocumentMetadataVersion'); | 618 | KTEntityUtil::clearAllCaches('KTDocumentMetadataVersion'); |
lib/documentmanagement/documentcore.inc.php
| @@ -82,6 +82,8 @@ class KTDocumentCore extends KTEntity { | @@ -82,6 +82,8 @@ class KTDocumentCore extends KTEntity { | ||
| 82 | 82 | ||
| 83 | var $dCheckedOut; | 83 | var $dCheckedOut; |
| 84 | 84 | ||
| 85 | + var $sOemNo; | ||
| 86 | + | ||
| 85 | var $_aFieldToSelect = array( | 87 | var $_aFieldToSelect = array( |
| 86 | "iId" => "id", | 88 | "iId" => "id", |
| 87 | 89 | ||
| @@ -114,10 +116,11 @@ class KTDocumentCore extends KTEntity { | @@ -114,10 +116,11 @@ class KTDocumentCore extends KTEntity { | ||
| 114 | 'iRestoreFolderId' => 'restore_folder_id', | 116 | 'iRestoreFolderId' => 'restore_folder_id', |
| 115 | 'sRestoreFolderPath' => 'restore_folder_path', | 117 | 'sRestoreFolderPath' => 'restore_folder_path', |
| 116 | 118 | ||
| 117 | - 'dCheckedOut'=>'checkedout' | 119 | + 'dCheckedOut'=>'checkedout', |
| 120 | + 'sOemNo'=>'oem_no' | ||
| 118 | ); | 121 | ); |
| 119 | 122 | ||
| 120 | - function KTDocument() { | 123 | + function KTDocumentCore() { |
| 121 | } | 124 | } |
| 122 | 125 | ||
| 123 | // {{{ getters/setters | 126 | // {{{ getters/setters |
| @@ -133,6 +136,8 @@ class KTDocumentCore extends KTEntity { | @@ -133,6 +136,8 @@ class KTDocumentCore extends KTEntity { | ||
| 133 | function getCheckedOutDate() { return $this->dCheckedOut; } | 136 | function getCheckedOutDate() { return $this->dCheckedOut; } |
| 134 | function setCheckedOutDate($dNewValue) { $this->dCheckedOut = $dNewValue; } | 137 | function setCheckedOutDate($dNewValue) { $this->dCheckedOut = $dNewValue; } |
| 135 | 138 | ||
| 139 | + function getOemNo() { return $this->sOemNo; } | ||
| 140 | + | ||
| 136 | function getFolderId() { return $this->iFolderId; } | 141 | function getFolderId() { return $this->iFolderId; } |
| 137 | function setFolderId($iNewValue) { $this->iFolderId = $iNewValue; } | 142 | function setFolderId($iNewValue) { $this->iFolderId = $iNewValue; } |
| 138 | 143 |