Commit 4385b28576f04bc7344488815395eeb614624808
1 parent
ca91703f
don't display add collaboration step button if the folder has documents in collaboration
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1531 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
15 additions
and
9 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editBL.php
| @@ -93,7 +93,10 @@ if (checkSession()) { | @@ -93,7 +93,10 @@ if (checkSession()) { | ||
| 93 | $main->render(); | 93 | $main->render(); |
| 94 | } else { | 94 | } else { |
| 95 | $oPatternCustom = & new PatternCustom(); | 95 | $oPatternCustom = & new PatternCustom(); |
| 96 | - $oPatternCustom->setHtml(getPage($fFolderID)); | 96 | + // does this folder have a document in it that has started collaboration? |
| 97 | + $bCollaboration = Folder::hasDocumentInCollaboration($fFolderID); | ||
| 98 | + | ||
| 99 | + $oPatternCustom->setHtml(getPage($fFolderID, $bCollaboration)); | ||
| 97 | $main->setCentralPayload($oPatternCustom); | 100 | $main->setCentralPayload($oPatternCustom); |
| 98 | $main->setHasRequiredFields(true); | 101 | $main->setHasRequiredFields(true); |
| 99 | $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=browse&fFolderID=$fFolderID")); | 102 | $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=browse&fFolderID=$fFolderID")); |
presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
| @@ -146,7 +146,7 @@ function getFolderGroupAccess($iFolderID) { | @@ -146,7 +146,7 @@ function getFolderGroupAccess($iFolderID) { | ||
| 146 | return $oPatternTableSqlQuery->render(); | 146 | return $oPatternTableSqlQuery->render(); |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | -function getPage($iFolderID) { | 149 | +function getPage($iFolderID, $bCollaboration = false) { |
| 150 | global $default; | 150 | global $default; |
| 151 | 151 | ||
| 152 | $sToRender = renderHeading(); | 152 | $sToRender = renderHeading(); |
| @@ -154,7 +154,7 @@ function getPage($iFolderID) { | @@ -154,7 +154,7 @@ function getPage($iFolderID) { | ||
| 154 | $sToRender .= "<table border=\"0\" width=\"100%\">\n"; | 154 | $sToRender .= "<table border=\"0\" width=\"100%\">\n"; |
| 155 | $sToRender .= "<tr>\n"; | 155 | $sToRender .= "<tr>\n"; |
| 156 | $sToRender .= "<td valign=\"top\">\n"; | 156 | $sToRender .= "<td valign=\"top\">\n"; |
| 157 | - $sToRender .= getLeftSide($iFolderID); | 157 | + $sToRender .= getLeftSide($iFolderID, $bCollaboration); |
| 158 | $sToRender .= "</td>\n"; | 158 | $sToRender .= "</td>\n"; |
| 159 | $sToRender .= "<td valign=\"top\">\n"; | 159 | $sToRender .= "<td valign=\"top\">\n"; |
| 160 | $sToRender .= getRightSide($iFolderID); | 160 | $sToRender .= getRightSide($iFolderID); |
| @@ -164,7 +164,7 @@ function getPage($iFolderID) { | @@ -164,7 +164,7 @@ function getPage($iFolderID) { | ||
| 164 | return $sToRender; | 164 | return $sToRender; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | -function getLeftSide($iFolderID) { | 167 | +function getLeftSide($iFolderID, $bCollaboration) { |
| 168 | global $default; | 168 | global $default; |
| 169 | $sToRender .= "<table border=\"0\" width=\"100%\">\n"; | 169 | $sToRender .= "<table border=\"0\" width=\"100%\">\n"; |
| 170 | $sToRender .= "<tr>\n"; | 170 | $sToRender .= "<tr>\n"; |
| @@ -182,11 +182,14 @@ function getLeftSide($iFolderID) { | @@ -182,11 +182,14 @@ function getLeftSide($iFolderID) { | ||
| 182 | $sToRender .= getFolderRouting($iFolderID) . "\n"; | 182 | $sToRender .= getFolderRouting($iFolderID) . "\n"; |
| 183 | $sToRender .= "</td>\n"; | 183 | $sToRender .= "</td>\n"; |
| 184 | $sToRender .= "</tr>\n"; | 184 | $sToRender .= "</tr>\n"; |
| 185 | - $sToRender .= "<tr>\n"; | ||
| 186 | - $sToRender .= "<td>\n"; | ||
| 187 | - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=addFolderCollaboration&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a>\n"; | ||
| 188 | - $sToRender .= "</td>\n"; | ||
| 189 | - $sToRender .= "</tr>\n"; | 185 | + if (!$bCollaboration) { |
| 186 | + $sToRender .= "<tr>\n"; | ||
| 187 | + $sToRender .= "<td>\n"; | ||
| 188 | + $sToRender .= "<a href=\"$default->rootUrl/control.php?action=addFolderCollaboration&fFolderID=$iFolderID\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\" /></a>\n"; | ||
| 189 | + $sToRender .= "</td>\n"; | ||
| 190 | + $sToRender .= "</tr>\n"; | ||
| 191 | + } | ||
| 192 | + | ||
| 190 | $sToRender .= "</table>\n"; | 193 | $sToRender .= "</table>\n"; |
| 191 | return $sToRender; | 194 | return $sToRender; |
| 192 | } | 195 | } |