Peter M. Groen / knowledgetree

Commit 9a546b577964afe21011a752aa101fa17c2bd178

Authored by rob
1 parent 8fdf0887

Added functionality to show default user for document routing 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2054 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @9a546b5
... ... @@ -118,11 +118,12 @@ function renderTypeSpecificMetaData($oDocument) {
118 118  
119 119 function renderEditableDocumentRouting($oDocument) {
120 120 global $default;
121   - $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 " .
  121 + $sQuery = "SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.Name, U2.Name, 'Not assigned') AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done, 'Edit' as edit " .
122 122 "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " .
123 123 "INNER JOIN roles AS R ON GFAL.role_id = R.id " .
  124 + "INNER JOIN users AS U2 ON U2.id = GFAL.user_id " .
124 125 "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " .
125   - "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " .
  126 + "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " .
126 127 "WHERE D.id = " . $oDocument->getID() . " " .
127 128 "ORDER BY GFAL.precedence, role_name ASC";
128 129 $aColumns = array("role_name", "name", "precedence", "active", "done", "edit");
... ...