Peter M. Groen / knowledgetree

Commit 850453cd6fd3f60ccc563fe15956803b2ddade88

Authored by Michael Joseph
1 parent c471ec98

corrected conditions under which the archive button is shown 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2410 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @850453c
@@ -401,7 +401,9 @@ function displayActionButtons($oDocument, $bEdit) { @@ -401,7 +401,9 @@ function displayActionButtons($oDocument, $bEdit) {
401 } 401 }
402 $sToRender .= "<tr><td align=\"left\"><a href=\"" . generateControllerLink("viewDiscussion", "fDocumentID=" . $oDocument->getID() . "&fForDiscussion=1") . "\"><img src=\"$default->graphicsUrl/widgets/docactions/discussion.gif\" border=\"0\" /></a></td></tr>\n"; 402 $sToRender .= "<tr><td align=\"left\"><a href=\"" . generateControllerLink("viewDiscussion", "fDocumentID=" . $oDocument->getID() . "&fForDiscussion=1") . "\"><img src=\"$default->graphicsUrl/widgets/docactions/discussion.gif\" border=\"0\" /></a></td></tr>\n";
403 // only display the archive button for available documents 403 // only display the archive button for available documents
404 - if (!$oDocument->getIsCheckedOut() && !$oDocument->hasCollaboration() && (!DocumentCollaboration::documentCollaborationStarted($oDocument->getID()))) { 404 + // if the document is not checked out
  405 + // and if the document is not in collaboration
  406 + if (!$oDocument->getIsCheckedOut() && (!$oDocument->hasCollaboration() || !DocumentCollaboration::documentCollaborationStarted($oDocument->getID()))) {
405 $sToRender .= "<tr><td align=\"left\"><a href=\"" . generateControllerLink("archiveDocument", "fDocumentID=" . $oDocument->getID()) . "\"><img src=\"$default->graphicsUrl/widgets/docactions/archive.gif\" border=\"0\" /></a></td></tr>\n"; 407 $sToRender .= "<tr><td align=\"left\"><a href=\"" . generateControllerLink("archiveDocument", "fDocumentID=" . $oDocument->getID()) . "\"><img src=\"$default->graphicsUrl/widgets/docactions/archive.gif\" border=\"0\" /></a></td></tr>\n";
406 } else { 408 } else {
407 $iDummyButtons++; 409 $iDummyButtons++;