Peter M. Groen / knowledgetree

Commit 85a5181c6eaebcb1976d11ecbaace09d441826e2

Authored by michael
1 parent 32685add

added join on settings table to display archiving type 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2229 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @85a5181
@@ -125,7 +125,8 @@ function renderTypeSpecificMetaData($oDocument, $bEditable) { @@ -125,7 +125,8 @@ function renderTypeSpecificMetaData($oDocument, $bEditable) {
125 function renderEditableDocumentArchiveSettings($oDocument) { 125 function renderEditableDocumentArchiveSettings($oDocument) {
126 global $default; 126 global $default;
127 $sQuery = "SELECT d.id, atl.name, 'Edit' AS edit FROM $default->owl_document_archiving_table AS da " . 127 $sQuery = "SELECT d.id, atl.name, 'Edit' AS edit FROM $default->owl_document_archiving_table AS da " .
128 - "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " . 128 + "INNER JOIN $default->owl_archiving_settings_table AS ast ON da.archiving_settings_id=ast.id " .
  129 + "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON ast.archiving_type_id=atl.id " .
129 "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . 130 "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " .
130 "WHERE d.id = " . $oDocument->getID(); 131 "WHERE d.id = " . $oDocument->getID();
131 132
@@ -145,7 +146,8 @@ function renderEditableDocumentArchiveSettings($oDocument) { @@ -145,7 +146,8 @@ function renderEditableDocumentArchiveSettings($oDocument) {
145 function renderNonEditableDocumentArchiveSettings($oDocument) { 146 function renderNonEditableDocumentArchiveSettings($oDocument) {
146 global $default; 147 global $default;
147 $sQuery = "SELECT d.id, atl.name FROM $default->owl_document_archiving_table AS da " . 148 $sQuery = "SELECT d.id, atl.name FROM $default->owl_document_archiving_table AS da " .
148 - "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " . 149 + "INNER JOIN $default->owl_archiving_settings_table AS ast ON da.archiving_settings_id=ast.id " .
  150 + "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON ast.archiving_type_id=atl.id " .
149 "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . 151 "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " .
150 "WHERE d.id = " . $oDocument->getID(); 152 "WHERE d.id = " . $oDocument->getID();
151 153