Skip to content

Commit 48dc14d

Browse files
integrating bug #4640 on master
fixing index of menu items
1 parent 104704c commit 48dc14d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

war-core/src/main/webapp/attachment/jsp/displayAttachedFiles.jsp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -478,15 +478,15 @@
478478
$.post('<c:url value="/Attachment" />', {Id:id, FileLanguage:'<c:out value="${contentLanguage}" />', Action:'Checkout'}, function(data) {
479479
if (data == 'ok') {
480480
var oMenu = eval("oMenu" + oldId);
481-
oMenu.getItem(3).cfg.setProperty("disabled", false);
482-
oMenu.getItem(0).cfg.setProperty("disabled", true);
483-
oMenu.getItem(1).cfg.setProperty("disabled", true);
481+
oMenu.getItem(3).cfg.setProperty("disabled", false); // checkin
482+
oMenu.getItem(0).cfg.setProperty("disabled", true); // checkout
483+
oMenu.getItem(1).cfg.setProperty("disabled", true); // checkout and download
484484
if (!webdav) {
485-
oMenu.getItem(2).cfg.setProperty("disabled", true);
485+
oMenu.getItem(2).cfg.setProperty("disabled", true); // edit online
486486
}
487487
//disable delete
488-
oMenu.getItem(4, 1).cfg.setProperty("disabled", true);
489-
oMenu.getItem(3, 1).cfg.setProperty("disabled", true);
488+
oMenu.getItem(3, 1).cfg.setProperty("disabled", true); // delete
489+
oMenu.getItem(2, 1).cfg.setProperty("disabled", true); // switch
490490
$('#worker' + oldId).html("<fmt:message key="readOnly"/> <%=m_MainSessionCtrl.getCurrentUserDetail().getDisplayedName()%> <fmt:message key="at"/> <%=DateUtil.getOutputDate(new Date(), language)%>");
491491
$('#worker' + oldId).css({'visibility':'visible'});
492492
if (edit) {
@@ -551,8 +551,8 @@
551551
oMenu.getItem(0).cfg.setProperty("disabled", false);
552552
oMenu.getItem(1).cfg.setProperty("disabled", false);
553553
oMenu.getItem(2).cfg.setProperty("disabled", false);
554-
oMenu.getItem(4, 1).cfg.setProperty("disabled", false)
555-
oMenu.getItem(3, 1).cfg.setProperty("disabled", false);
554+
oMenu.getItem(3, 1).cfg.setProperty("disabled", false)
555+
oMenu.getItem(2, 1).cfg.setProperty("disabled", false);
556556
$('#worker' + id).html("");
557557
$('#worker' + id).css({'visibility':'hidden'});
558558
if (pageMustBeReloadingAfterSorting) {

web-core/src/main/java/org/silverpeas/attachment/tag/SimpleDocumentContextualMenu.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ String configureUpdate(String attachmentId, boolean disable) {
259259
}
260260

261261
String configureDelete(String attachmentId, boolean disable) {
262-
return String.format(template, attachmentId, "4, 1", disable);
262+
return String.format(template, attachmentId, "3, 1", disable);
263263
}
264264

265265
String configureXmlForm(String attachmentId, boolean disable) {
@@ -271,7 +271,7 @@ String configureFileSharing(String attachmentId, boolean disable) {
271271
}
272272

273273
String configureSwitchState(String attachmentId, boolean disable) {
274-
return String.format(template, attachmentId, "3, 1", disable);
274+
return String.format(template, attachmentId, "2, 1", disable);
275275
}
276276

277277
String configureNotify(String attachmentId, boolean disable) {

0 commit comments

Comments
 (0)