Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 0c554b0

Browse files
committed
BUG: Refs #0480. Do not allow user and community root folders to be selected as destination folder in movecopyForm.
1 parent 85e5a00 commit 0c554b0

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

core/public/js/browse/browse.movecopy.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,18 @@ midas.browse.moveCopyCallbackSelect = function (node) {
5555

5656
$('#selectedDestinationHidden').val(node.attr('element'));
5757
$('#selectedDestination').html(sliceFileName(selectedElement, 40));
58-
$('#selectElement').removeAttr('disabled');
59-
$('#shareElement').removeAttr('disabled');
60-
$('#duplicateElement').removeAttr('disabled');
61-
$('#moveElement').removeAttr('disabled');
58+
if(node.attr('element') == -1 || node.attr('element') == -2 ) {
59+
$('#selectElement').attr('disabled', 'disabled');
60+
$('#shareElement').attr('disabled', 'disabled');
61+
$('#duplicateElement').attr('disabled', 'disabled');
62+
$('#moveElement').attr('disabled', 'disabled');
63+
}
64+
else {
65+
$('#selectElement').removeAttr('disabled');
66+
$('#shareElement').removeAttr('disabled');
67+
$('#duplicateElement').removeAttr('disabled');
68+
$('#moveElement').removeAttr('disabled');
69+
}
6270
};
6371

6472

core/views/browse/movecopy.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/b
3737
foreach($this->communities as $community)
3838
{
3939
$folder=$community->getFolder();
40-
echo "<tr id='node--$node' class='parent' privacy='".($community->getPrivacy() == 1 ? MIDAS_PRIVACY_PRIVATE : MIDAS_PRIVACY_PUBLIC )."' type='community' element='{$community->getCommunityId()}' ajax='{$folder->getFolderId()}'>";
40+
echo "<tr id='node--$node' class='parent' privacy='".($community->getPrivacy() == 1 ? MIDAS_PRIVACY_PRIVATE : MIDAS_PRIVACY_PUBLIC )."' type='community' element='-2' ajax='{$folder->getFolderId()}'>";
4141
echo " <td class='treeBrowseElement'><span class='community'>{$community->getName()}</span></td>";
4242
echo "</tr>";
4343
$node++;

0 commit comments

Comments
 (0)