Peter M. Groen / knowledgetree

Commit a38619f7f630e92324bf620089932e21d1f9e4ae

Authored by rob
1 parent 08be9afc

Updated display to show default user for document routing 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2027 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 8 additions and 7 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
  View file @a38619f
@@ -106,18 +106,19 @@ function getFolderDocTypes($iFolderID) { @@ -106,18 +106,19 @@ 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, R.name AS role_name, GFAL.precedence AS precedence, 'Edit' as edit, 'Delete' as del, 'Dependant Docs' as depn " . 109 + $sQuery = "SELECT GFAL.id as id, GFAL.folder_id AS folder_id, G.name AS group_name, 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 " .
110 "FROM $default->owl_groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " . 110 "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 " . 111 "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 " .
112 "WHERE GFAL.folder_id = $iFolderID " . 113 "WHERE GFAL.folder_id = $iFolderID " .
113 "ORDER BY GFAL.precedence, role_name ASC"; 114 "ORDER BY GFAL.precedence, role_name ASC";
114 115
115 - $aColumns = array("group_name", "role_name", "precedence", "edit", "del", "depn");  
116 - $aColumnHeaders = array("Group", "Role", "Seq", "", "");  
117 - $aColumnTypes = array(1,1,1,3,3,3);  
118 - $aDBColumnArray = array("id","folder_id");  
119 - $aQueryStringVariableNames = array("fFolderCollaborationID", "fFolderID");  
120 - $aLinkURLs = array(3=>"$default->rootUrl/control.php?action=modifyFolderCollaboration",4=>"$default->rootUrl/control.php?action=deleteFolderCollaboration", 5=>"$default->rootUrl/control.php?action=viewDependantDocument"); 116 + $aColumns = array("group_name", "role_name", "precedence", "user_name", "edit", "del", "depn");
  117 + $aColumnHeaders = array("Group", "Role", "Seq", "User", "", "");
  118 + $aColumnTypes = array(1,1,1,1,3,3,3);
  119 + $aDBColumnArray = array("id","folder_id","user_id");
  120 + $aQueryStringVariableNames = array("fFolderCollaborationID", "fFolderID", "fUserID");
  121 + $aLinkURLs = array(4=>"$default->rootUrl/control.php?action=modifyFolderCollaboration",5=>"$default->rootUrl/control.php?action=deleteFolderCollaboration", 5=>"$default->rootUrl/control.php?action=viewDependantDocument");
121 122
122 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "90%", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames); 123 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "90%", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames);
123 $oPatternTableSqlQuery->setTableHeading("Document Routing"); 124 $oPatternTableSqlQuery->setTableHeading("Document Routing");