From f45549487032664f392110958f410e50c63fd10d Mon Sep 17 00:00:00 2001 From: rob Date: Tue, 3 Jun 2003 15:14:01 +0000 Subject: [PATCH] Updated so that when editing document routing - if no user is selected, default user is filled in --- presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php index 3ee5b6b..17c90f1 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php @@ -85,7 +85,7 @@ if (checkSession()) { //go back to the document view page redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID"); } else { - //the may have been unassigned and no new user assigned + //the user may have been unassigned and no new user assigned //if this is true, delete the folder_user_role_link $oFolderUserRole = & FolderUserRole::getFromFolderCollaboration($fFolderCollaborationID, $fDocumentID); if (!($oFolderUserRole === false)) { @@ -127,9 +127,10 @@ if (checkSession()) { function getFolderCollaborationArray($fFolderCollaborationID, $fDocumentID) { global $default; - $sQuery = "SELECT GFL.group_id AS group_id, GFL.folder_id AS folder_id, GFL.precedence AS precedence, GFL.role_id, U.id AS user_id " . + $sQuery = "SELECT GFL.group_id AS group_id, GFL.folder_id AS folder_id, GFL.precedence AS precedence, GFL.role_id, COALESCE(U.id, U2.id) AS user_id " . "FROM $default->owl_groups_folders_approval_table AS GFL LEFT OUTER JOIN folders_users_roles_link AS FURL ON FURL.group_folder_approval_id = GFL.id AND FURL.document_id = $fDocumentID " . "LEFT OUTER JOIN users AS U ON FURL.user_id = U.id " . + "LEFT OUTER JOIN users AS U2 ON GFL.user_id = U2.id " . "WHERE GFL.id = $fFolderCollaborationID"; $sql = $default->db; $sql->query($sQuery); -- libgit2 0.21.4