Peter M. Groen / knowledgetree

Commit 3863099427f4bf4e119ca2cd56ee38b0604b6f1c

Authored by Neil Blakey-Milner
1 parent f1722345

Rename TestFolder to more useful InheritedFolder, and try to match the 

colour scheme a bit.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3049 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 23 additions and 14 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
  View file @3863099
@@ -136,19 +136,20 @@ function getFolderGroupAccess($iFolderID, $sDivName) { @@ -136,19 +136,20 @@ function getFolderGroupAccess($iFolderID, $sDivName) {
136 "INNER JOIN $default->groups_table AS GL ON GFL.group_id = GL.id " . 136 "INNER JOIN $default->groups_table AS GL ON GFL.group_id = GL.id " .
137 "WHERE GFL.folder_id = ?"; 137 "WHERE GFL.folder_id = ?";
138 138
139 - $iTestFolderID = $iFolderID; 139 + $iInheritedFolderID = $iFolderID;
140 $bFoundPermissions = false; 140 $bFoundPermissions = false;
141 - $bDisabled = false; 141 + $bInherited = false;
  142 + $oInheritedFolder = Folder::get($iInheritedFolderID);
142 while ($bFoundPermissions !== true) { 143 while ($bFoundPermissions !== true) {
143 - $aCheckQuery = array('SELECT id FROM groups_folders_link WHERE folder_id = ? LIMIT 1', $iTestFolderID); 144 + $aCheckQuery = array('SELECT id FROM groups_folders_link WHERE folder_id = ? LIMIT 1', $iInheritedFolderID);
144 if (count(DBUtil::getResultArrayKey($aCheckQuery, 'id')) == 0) { 145 if (count(DBUtil::getResultArrayKey($aCheckQuery, 'id')) == 0) {
145 - $default->log->info('No direct permissions on folder ' . $iTestFolderID);  
146 - $bDisabled = true;  
147 - $oTestFolder = Folder::get($iTestFolderID);  
148 - $iTestFolderID = $oTestFolder->getParentID();  
149 - $default->log->info('... trying parent: ' . $iTestFolderID); 146 + $default->log->info('No direct permissions on folder ' . $iInheritedFolderID);
  147 + $bInherited = true;
  148 + $iInheritedFolderID = $oInheritedFolder->getParentID();
  149 + $oInheritedFolder = Folder::get($iInheritedFolderID);
  150 + $default->log->info('... trying parent: ' . $iInheritedFolderID);
150 } else { 151 } else {
151 - $default->log->info('Found direct permissions on folder ' . $iTestFolderID); 152 + $default->log->info('Found direct permissions on folder ' . $iInheritedFolderID);
152 break; 153 break;
153 } 154 }
154 } 155 }
@@ -160,17 +161,25 @@ function getFolderGroupAccess($iFolderID, $sDivName) { @@ -160,17 +161,25 @@ function getFolderGroupAccess($iFolderID, $sDivName) {
160 $aQueryStringVariableNames = array("fGroupFolderLinkID", "fFolderID"); 161 $aQueryStringVariableNames = array("fGroupFolderLinkID", "fFolderID");
161 $aLinkURLs = array(3=>"$default->rootUrl/control.php?action=modifyGroupFolderLink",4=>"$default->rootUrl/control.php?action=deleteGroupFolderLink"); 162 $aLinkURLs = array(3=>"$default->rootUrl/control.php?action=modifyGroupFolderLink",4=>"$default->rootUrl/control.php?action=deleteGroupFolderLink");
162 163
163 - $oPatternTableSqlQuery = & new PatternTableSqlQuery(array($sQuery, $iTestFolderID), $aColumns, $aColumnTypes, $aColumnHeaders, "610", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames); 164 + $oPatternTableSqlQuery = & new PatternTableSqlQuery(array($sQuery, $iInheritedFolderID), $aColumns, $aColumnTypes, $aColumnHeaders, "610", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames);
164 $oPatternTableSqlQuery->setTableHeading("Folder Permissions"); 165 $oPatternTableSqlQuery->setTableHeading("Folder Permissions");
165 $oPatternTableSqlQuery->setDisplayColumnHeadings(true); 166 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
166 - if ($bDisabled === true) {  
167 - $oPatternTableSqlQuery->setDisabled($bDisabled); 167 + if ($bInherited === true) {
  168 + $oPatternTableSqlQuery->setDisabled(true);
168 $oPatternTableSqlQuery->setTableHeading("Folder Permissions (inherited)"); 169 $oPatternTableSqlQuery->setTableHeading("Folder Permissions (inherited)");
169 } 170 }
170 -  
171 $sToRender .= "<table>"; 171 $sToRender .= "<table>";
172 $sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>"; 172 $sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>";
173 - $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=addGroupFolderLink&fFolderID=$iFolderID\"><img src=\"" . KTHtml::getAddButton() . "\" border=\"0\" /></a></td></tr>"; 173 + if ($bInherited === true) {
  174 + $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
  175 + $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
  176 + $sToRender .= '<tr><td>Inherited from: <span style="background-color: ' . $sTDBGColour . ';">';
  177 +
  178 + $sToRender .= displayFolderPathLink(Folder::getFolderPathAsArray($iInheritedFolderID), Folder::getFolderPathNamesAsArray($iInheritedFolderID), "$default->rootUrl/control.php?action=editFolder");
  179 + $sToRender .= "</span></td></tr>";
  180 + } else {
  181 + $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=addGroupFolderLink&fFolderID=$iFolderID\"><img src=\"" . KTHtml::getAddButton() . "\" border=\"0\" /></a></td></tr>";
  182 + }
174 $sToRender .= "</table>"; 183 $sToRender .= "</table>";
175 return renderSectionDiv($sDivName, $sToRender); 184 return renderSectionDiv($sDivName, $sToRender);
176 } 185 }