Peter M. Groen / knowledgetree

Commit 5c68f307cbe4a9e60af47d95a16e408ff354d49a

Authored by Michael Joseph
1 parent 99546a71

removed owl prefix from table aliases 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2592 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 20 additions and 20 deletions
sync/pathSync.php
  View file @5c68f30
@@ -48,7 +48,7 @@ function updateFolder($oFolder) { @@ -48,7 +48,7 @@ function updateFolder($oFolder) {
48 $sql = $default->db; 48 $sql = $default->db;
49 //root folders won't get anything added to them 49 //root folders won't get anything added to them
50 if (strlen($sFullPath) > 0) { 50 if (strlen($sFullPath) > 0) {
51 - $sql->query("UPDATE " . $default->owl_folders_table . " SET " . 51 + $sql->query("UPDATE " . $default->folders_table . " SET " .
52 "full_path = '" . addslashes($sFullPath) . "', " . 52 "full_path = '" . addslashes($sFullPath) . "', " .
53 "parent_folder_ids = '" . addslashes($sParentIDs) . "' " . 53 "parent_folder_ids = '" . addslashes($sParentIDs) . "' " .
54 "WHERE id = " . $oFolder->getID()); 54 "WHERE id = " . $oFolder->getID());
tests/documentmanagement/viewBL.php
  View file @5c68f30
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 22
23 require_once("../../config/dmsDefaults.php"); 23 require_once("../../config/dmsDefaults.php");
24 24
25 -require_once("$default->fileSystemRoot/lib/security/permission.inc"); 25 +require_once("$default->fileSystemRoot/lib/security/Permission.inc");
26 26
27 require_once("$default->fileSystemRoot/lib/email/Email.inc"); 27 require_once("$default->fileSystemRoot/lib/email/Email.inc");
28 28
tests/documentmanagement/viewUI.inc
  View file @5c68f30
@@ -26,13 +26,13 @@ function renderDocumentPath($oDocument) { @@ -26,13 +26,13 @@ function renderDocumentPath($oDocument) {
26 function renderDocumentData($oDocument, $sDivName, $bEditable) { 26 function renderDocumentData($oDocument, $sDivName, $bEditable) {
27 global $default; 27 global $default;
28 $sQuery = "SELECT D.name, D.modified, DTT.datetime AS created, U.name AS initiator, CONCAT(CONCAT(D.major_version, '.'), D.minor_version) AS version, WDSL.name AS status, DTL.name AS document_type, D.is_checked_out, COALESCE(U2.name, '') AS c_user " . 28 $sQuery = "SELECT D.name, D.modified, DTT.datetime AS created, U.name AS initiator, CONCAT(CONCAT(D.major_version, '.'), D.minor_version) AS version, WDSL.name AS status, DTL.name AS document_type, D.is_checked_out, COALESCE(U2.name, '') AS c_user " .
29 - "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_web_documents_table AS WD ON WD.document_id = D.ID " .  
30 - "INNER JOIN $default->owl_web_documents_status_table AS WDSL ON WD.status_id = WDSL.id " .  
31 - "INNER JOIN $default->owl_users_table AS U ON U.id = D.creator_id " .  
32 - "INNER JOIN $default->owl_document_transactions_table AS DTT ON DTT.document_id = D.id " .  
33 - "INNER JOIN $default->owl_transaction_types_table AS TT ON DTT.transaction_id = TT.id " .  
34 - "INNER JOIN $default->owl_document_types_table AS DTL ON DTL.id = D.document_type_id " .  
35 - "LEFT OUTER JOIN $default->owl_users_table AS U2 ON U2.id = D.checked_out_user_id " . 29 + "FROM $default->documents_table AS D INNER JOIN $default->web_documents_table AS WD ON WD.document_id = D.ID " .
  30 + "INNER JOIN $default->web_documents_status_table AS WDSL ON WD.status_id = WDSL.id " .
  31 + "INNER JOIN $default->users_table AS U ON U.id = D.creator_id " .
  32 + "INNER JOIN $default->document_transactions_table AS DTT ON DTT.document_id = D.id " .
  33 + "INNER JOIN $default->transaction_types_table AS TT ON DTT.transaction_id = TT.id " .
  34 + "INNER JOIN $default->document_types_table AS DTL ON DTL.id = D.document_type_id " .
  35 + "LEFT OUTER JOIN $default->users_table AS U2 ON U2.id = D.checked_out_user_id " .
36 "WHERE D.id = " . $oDocument->getID() . " " . 36 "WHERE D.id = " . $oDocument->getID() . " " .
37 "AND TT.name LIKE 'Create'"; 37 "AND TT.name LIKE 'Create'";
38 38
@@ -61,8 +61,8 @@ function renderDocumentData($oDocument, $sDivName, $bEditable) { @@ -61,8 +61,8 @@ function renderDocumentData($oDocument, $sDivName, $bEditable) {
61 function renderGenericMetaData($oDocument, $sDivName, $bEditable) { 61 function renderGenericMetaData($oDocument, $sDivName, $bEditable) {
62 global $default; 62 global $default;
63 $sQuery = "SELECT DF.name AS name, DFL.value as value " . 63 $sQuery = "SELECT DF.name AS name, DFL.value as value " .
64 - "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_fields_table AS DFL ON D.id = DFL.document_id " .  
65 - "INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " . 64 + "FROM $default->documents_table AS D INNER JOIN $default->document_fields_link_table AS DFL ON D.id = DFL.document_id " .
  65 + "INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " .
66 "WHERE document_id = " . $oDocument->getID() . " " . 66 "WHERE document_id = " . $oDocument->getID() . " " .
67 "AND DF.is_generic = 1"; 67 "AND DF.is_generic = 1";
68 $aColumns = array("name", "value"); 68 $aColumns = array("name", "value");
@@ -117,9 +117,9 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { @@ -117,9 +117,9 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) {
117 117
118 function renderEditableDocumentArchiveSettings($oDocument) { 118 function renderEditableDocumentArchiveSettings($oDocument) {
119 global $default; 119 global $default;
120 - $sQuery = "SELECT d.id, atl.name, 'Edit' AS edit FROM $default->owl_document_archiving_table AS da " .  
121 - "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " .  
122 - "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . 120 + $sQuery = "SELECT d.id, atl.name, 'Edit' AS edit FROM $default->document_archiving_table AS da " .
  121 + "INNER JOIN $default->archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " .
  122 + "INNER JOIN $default->documents_table AS d ON da.document_id=d.id " .
123 "WHERE d.id = " . $oDocument->getID(); 123 "WHERE d.id = " . $oDocument->getID();
124 124
125 $aColumns = array("name", "edit"); 125 $aColumns = array("name", "edit");
@@ -136,9 +136,9 @@ function renderEditableDocumentArchiveSettings($oDocument) { @@ -136,9 +136,9 @@ function renderEditableDocumentArchiveSettings($oDocument) {
136 } 136 }
137 function renderNonEditableDocumentArchiveSettings($oDocument) { 137 function renderNonEditableDocumentArchiveSettings($oDocument) {
138 global $default; 138 global $default;
139 - $sQuery = "SELECT d.id, atl.name FROM $default->owl_document_archiving_table AS da " .  
140 - "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " .  
141 - "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . 139 + $sQuery = "SELECT d.id, atl.name FROM $default->document_archiving_table AS da " .
  140 + "INNER JOIN $default->archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " .
  141 + "INNER JOIN $default->documents_table AS d ON da.document_id=d.id " .
142 "WHERE d.id = " . $oDocument->getID(); 142 "WHERE d.id = " . $oDocument->getID();
143 143
144 $aColumns = array("name"); 144 $aColumns = array("name");
@@ -173,7 +173,7 @@ function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) { @@ -173,7 +173,7 @@ function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) {
173 function renderEditableDocumentRouting($oDocument, $sDivName) { 173 function renderEditableDocumentRouting($oDocument, $sDivName) {
174 global $default; 174 global $default;
175 $sQuery = "SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done, 'Edit' as edit " . 175 $sQuery = "SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done, 'Edit' as edit " .
176 - "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . 176 + "FROM documents AS D INNER JOIN $default->groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " .
177 "INNER JOIN roles AS R ON GFAL.role_id = R.id " . 177 "INNER JOIN roles AS R ON GFAL.role_id = R.id " .
178 "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " . 178 "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " .
179 "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " . 179 "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " .
@@ -235,7 +235,7 @@ function renderEditableDocumentRouting($oDocument, $sDivName) { @@ -235,7 +235,7 @@ function renderEditableDocumentRouting($oDocument, $sDivName) {
235 function renderNonEditableDocumentRouting($oDocument, $sDivName) { 235 function renderNonEditableDocumentRouting($oDocument, $sDivName) {
236 global $default; 236 global $default;
237 $sQuery = "SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done " . 237 $sQuery = "SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done " .
238 - "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . 238 + "FROM documents AS D INNER JOIN $default->groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " .
239 "INNER JOIN roles AS R ON GFAL.role_id = R.id " . 239 "INNER JOIN roles AS R ON GFAL.role_id = R.id " .
240 "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " . 240 "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " .
241 "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " . 241 "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " .
@@ -611,7 +611,7 @@ function getCheckInEditPage($oDocument) { @@ -611,7 +611,7 @@ function getCheckInEditPage($oDocument) {
611 function getWebPublishPage($oDocument) { 611 function getWebPublishPage($oDocument) {
612 global $default; 612 global $default;
613 613
614 - $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID"); 614 + $oPatternListBox = & new PatternListBox($default->web_sites_table, "web_site_name", "id", "fWebSiteID");
615 615
616 $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n<br>\n"; 616 $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n<br>\n";
617 $sToRender .= "<table border = 0>\n"; 617 $sToRender .= "<table border = 0>\n";