Peter M. Groen / knowledgetree

Commit 8cc2a93d4ab3581d23441748bbc6d4e94211f293

Authored by rob
1 parent cbe5df6f

Added functionality to account for null user for document routing 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2058 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
  View file @8cc2a93
@@ -106,10 +106,12 @@ function getFolderDocTypes($iFolderID) { @@ -106,10 +106,12 @@ function getFolderDocTypes($iFolderID) {
106 106
107 function getFolderRouting($iFolderID) { 107 function getFolderRouting($iFolderID) {
108 global $default; 108 global $default;
109 - $sQuery = "SELECT GFAL.id as id, GFAL.folder_id AS folder_id, G.name AS group_name, G.id AS group_id, GFAL.role_id AS role_id, R.name AS role_name, GFAL.precedence AS precedence, U.id AS user_id, U.name AS user_name, 'Edit' as edit, 'Delete' as del, 'Dependant Docs' as depn " . 109 + //had to use coalesce and left outer join for user_id because this column was a new addition
  110 + //and the user_ids for existing documents before this change will be null
  111 + $sQuery = "SELECT GFAL.id as id, GFAL.folder_id AS folder_id, G.name AS group_name, G.id AS group_id, GFAL.role_id AS role_id, R.name AS role_name, GFAL.precedence AS precedence, COALESCE(U.id, -1) AS user_id, COALESCE(U.name, 'Not Assigned') AS user_name, 'Edit' as edit, 'Delete' as del, 'Dependant docs' as depn " .
110 "FROM $default->owl_groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " . 112 "FROM $default->owl_groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " .
111 "INNER JOIN $default->owl_groups_table AS G ON G.id = GFAL.group_id " . 113 "INNER JOIN $default->owl_groups_table AS G ON G.id = GFAL.group_id " .
112 - "INNER JOIN $default->owl_users_table AS U ON U.id = GFAL.user_id " . 114 + "LEFT OUTER JOIN $default->owl_users_table AS U ON U.id = GFAL.user_id " .
113 "WHERE GFAL.folder_id = $iFolderID " . 115 "WHERE GFAL.folder_id = $iFolderID " .
114 "ORDER BY GFAL.precedence, role_name ASC"; 116 "ORDER BY GFAL.precedence, role_name ASC";
115 117