From 2e74b6261fd883935c4bc4c2bcad65c0ed02a858 Mon Sep 17 00:00:00 2001 From: rob Date: Tue, 3 Jun 2003 14:58:01 +0000 Subject: [PATCH] Added functionality to show default user for document routing --- presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc index 5e657e1..bcb5614 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc @@ -118,11 +118,12 @@ function renderTypeSpecificMetaData($oDocument) { function renderEditableDocumentRouting($oDocument) { global $default; - $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 " . + $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 " . "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . "INNER JOIN roles AS R ON GFAL.role_id = R.id " . + "INNER JOIN users AS U2 ON U2.id = GFAL.user_id " . "LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFAL.id AND FURL.document_id = D.id " . - "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " . + "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " . "WHERE D.id = " . $oDocument->getID() . " " . "ORDER BY GFAL.precedence, role_name ASC"; $aColumns = array("role_name", "name", "precedence", "active", "done", "edit"); -- libgit2 0.21.4