diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp
index 4808678d0e..57e51e1445 100644
--- a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp
+++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp
@@ -1,4 +1,4 @@
-<%@ page import="org.silverpeas.core.admin.user.model.SilverpeasRole" %><%--
+<%--
~ Copyright (C) 2000 - 2022 Silverpeas
~
~ This program is free software: you can redistribute it and/or modify
@@ -22,6 +22,9 @@
~ along with this program. If not, see .
--%>
+<%@ page import="org.silverpeas.core.admin.user.model.SilverpeasRole" %>
+<%@ page import="org.silverpeas.core.web.selection.BasketSelectionUI" %>
+
<%@ include file="almanachCheck.jsp" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -89,10 +92,12 @@
action="angularjs:eventMng.removeOccurrence(ceo)"
altText="${deleteLabel}"/>
-
-
+
+
+
+
diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java
index 15f0b06ecc..8fbfc0fcaa 100644
--- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java
+++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java
@@ -40,6 +40,8 @@
import java.io.IOException;
import java.io.Writer;
+import static org.silverpeas.core.web.selection.BasketSelectionUI.displayPutIntoBasketSelectionShortcut;
+
public class JSONServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -138,7 +140,7 @@ private void addPublicationOperations(final KmeliaSessionController kmeliaSC,
operations.put("cutPublications", copyCutAllowed);
operations.put("paste", addPublicationAllowed);
- operations.put("putPublicationsInBasket", publicationsInTopic);
+ operations.put("putPublicationsInBasket", publicationsInTopic && displayPutIntoBasketSelectionShortcut());
operations.put("sortPublications", role.isAdmin() && publicationsInTopic && somePublicationsExist);
diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp
index 1c5c5c6d9e..71a9c853a4 100644
--- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp
+++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp
@@ -55,6 +55,7 @@
<%@ page import="java.util.Optional" %>
<%@ page import="org.silverpeas.core.contribution.publication.model.Location" %>
<%@ page import="org.silverpeas.components.kmelia.model.ValidatorsList" %>
+<%@ page import="org.silverpeas.core.web.selection.BasketSelectionUI" %>
@@ -572,7 +573,8 @@
operationPane.addOperation(resources.getIcon("kmelia.cut"), resources.getString("GML.cut"), "javascript:clipboardCut()");
}
}
- if (!currentUser.isAccessGuest() && !currentUser.isAnonymous() && !pubDetail.isDraft() && !pubDetail.isClone()) {
+ if (!currentUser.isAccessGuest() && !currentUser.isAnonymous() && !pubDetail.isDraft() && !pubDetail.isClone() &&
+ BasketSelectionUI.displayPutIntoBasketSelectionShortcut()) {
operationPane.addLine();
operationPane.addOperation(basketIcon, resources.getString("GML.putInBasket"), "javascript:putInBasket()");
}
diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp
index ab15fbf573..a714130efa 100644
--- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp
+++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp
@@ -35,6 +35,7 @@
<%@page import="org.silverpeas.components.kmelia.SearchContext"%>
<%@ page import="org.silverpeas.core.web.util.viewgenerator.html.browsebars.BrowseBar" %>
<%@ page import="org.silverpeas.core.util.WebEncodeHelper" %>
+<%@ page import="org.silverpeas.core.web.selection.BasketSelectionUI" %>
@@ -205,14 +206,16 @@ window.SUBSCRIPTION_PROMISE.then(function() {
operationPane.addLine();
}
- if (!isGuest) {
- operationPane.addOperation("useless", resources.getString("kmelia.operation.putPublicationsInBasket"), "javascript:onclick=putPublicationsInBasket()");
- operationPane.addLine();
- operationPane.addOperation("useless", resources.getString("kmelia.operation.exportSelection"), "javascript:onclick=exportPublications()");
- operationPane.addOperation("useless", "", "javascript:onClick=spSubManager.switchUserSubscription()");
- operationPane.addOperation("useless", resources.getString("FavoritesAdd1")+" "+kmeliaScc.getString("FavoritesAdd2"), "javaScript:addFavorite('"+
+ if (!isGuest) {
+ if (BasketSelectionUI.displayPutIntoBasketSelectionShortcut()) {
+ operationPane.addOperation("useless", resources.getString("kmelia.operation.putPublicationsInBasket"), "javascript:onclick=putPublicationsInBasket()");
+ operationPane.addLine();
+ }
+ operationPane.addOperation("useless", resources.getString("kmelia.operation.exportSelection"), "javascript:onclick=exportPublications()");
+ operationPane.addOperation("useless", "", "javascript:onClick=spSubManager.switchUserSubscription()");
+ operationPane.addOperation("useless", resources.getString("FavoritesAdd1")+" "+kmeliaScc.getString("FavoritesAdd2"), "javaScript:addFavorite('"+
WebEncodeHelper.javaStringToHtmlString(WebEncodeHelper.javaStringToJsString(namePath))+"','','"+urlTopic+"')");
- }
+ }
if (userCanCreatePublications) {
operationPane.addLine();
diff --git a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp
index 1e330e5e70..a6550b91a5 100644
--- a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp
+++ b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp
@@ -27,6 +27,7 @@
<%@page import="org.silverpeas.core.admin.user.model.SilverpeasRole" %>
<%@ page import="org.silverpeas.core.util.URLUtil" %>
<%@ page import="org.silverpeas.core.notification.user.NotificationContext" %>
+<%@ page import="org.silverpeas.core.web.selection.BasketSelectionUI" %>
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
@@ -137,10 +138,12 @@ function putNewsInBasket() {
-
-
-
-
+
+
+
+
+
+