Commit d39ebd35c5c94c965d75dad65af154ae5c5ba4c2
1 parent
84940f74
*** empty log message ***
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1979 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
4 additions
and
4 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php
| @@ -48,12 +48,12 @@ if (checkSession()) { | @@ -48,12 +48,12 @@ if (checkSession()) { | ||
| 48 | redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fCollaborationEdit=0"); | 48 | redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fCollaborationEdit=0"); |
| 49 | } | 49 | } |
| 50 | if (isset($fForStore)) { | 50 | if (isset($fForStore)) { |
| 51 | - //if we are storing, get the folder collaboration entry from the database | 51 | + //if we are storing, get the folder collaboration entry from the database |
| 52 | $oFolderCollaboration = & FolderCollaboration::get($fFolderCollaborationID); | 52 | $oFolderCollaboration = & FolderCollaboration::get($fFolderCollaborationID); |
| 53 | if (isset($fUserID) && ($fUserID != "")) { | 53 | if (isset($fUserID) && ($fUserID != "")) { |
| 54 | //if a user has been selected, then set up the folders_users_roles_link database entry | 54 | //if a user has been selected, then set up the folders_users_roles_link database entry |
| 55 | - $oFolderUserRole = & FolderUserRole::getFromFolderCollaboration($fFolderCollaborationID, $fDocumentID); | ||
| 56 | - if (!($oFolderUserRole === false)) { | 55 | + $oFolderUserRole = & FolderUserRole::getFromFolderCollaboration($fFolderCollaborationID, $fDocumentID); |
| 56 | + if (!($oFolderUserRole === false)) { | ||
| 57 | //if we have an entry, just update it | 57 | //if we have an entry, just update it |
| 58 | if ($oFolderUserRole->getUserID() != $fUserID) { | 58 | if ($oFolderUserRole->getUserID() != $fUserID) { |
| 59 | //the user assigned has been changed, so inform the old user of his removal from the | 59 | //the user assigned has been changed, so inform the old user of his removal from the |
| @@ -70,7 +70,7 @@ if (checkSession()) { | @@ -70,7 +70,7 @@ if (checkSession()) { | ||
| 70 | $oFolderUserRole->update(); | 70 | $oFolderUserRole->update(); |
| 71 | } else { | 71 | } else { |
| 72 | //otherwise, create a new one | 72 | //otherwise, create a new one |
| 73 | - $oFolderUserRole = & new FolderUserRole($fUserID, $fDocumentID, $fFolderCollaborationID, 0); | 73 | + $oFolderUserRole = & new FolderUserRole($fUserID, $fDocumentID, $fFolderCollaborationID, 0); |
| 74 | $oFolderUserRole->create(); | 74 | $oFolderUserRole->create(); |
| 75 | } | 75 | } |
| 76 | //email the user to inform him of his newly assigned role in the collaboration process | 76 | //email the user to inform him of his newly assigned role in the collaboration process |