Feature #13573 : See also: improve display order of the publications

in this context : - We don't manage manual order - We don't persist the choosen order
Silverpeas · Aug 29, 2023 · e3ea666 · e3ea666
1 parent 6903b46
commit e3ea666
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/.../src/main/java/org/silverpeas/components/kmelia/servlets/AjaxPublicationsListServlet.java b/.../src/main/java/org/silverpeas/components/kmelia/servlets/AjaxPublicationsListServlet.java
@@ -129,6 +129,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse res) throws I
     String nodeId = req.getParameter("Id");
     String sToLink = req.getParameter("ToLink");
     String topicToLinkId = req.getParameter("TopicToLinkId");
+
+    boolean seeAlso = false;
+
     // check if trying to link attachment
     boolean attachmentToLink = req.getParameterAsBoolean("attachmentLink");
 
@@ -191,6 +194,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse res) throws I
       if (nbItemsPerPage != null) {
         kmeliaSC.setNbPublicationsPerPage(nbItemsPerPage);
       }
+      int previousSort = kmeliaSC.getSort().getCurrentSort();
       if (sort != null) {
         kmeliaSC.setSortValue(sort);
         final String contentLanguage = kmeliaSC.getCurrentLanguage();
@@ -208,18 +212,20 @@ public void doPost(HttpServletRequest request, HttpServletResponse res) throws I
 
       boolean sortAllowed = true;
       boolean linksAllowed = true;
-      boolean seeAlso = false;
       List<KmeliaPublication> publications;
       TopicDetail currentTopic;
       String role = kmeliaSC.getProfile();
       if (toLink) {
         currentTopic = kmeliaSC.getSessionTopicToLink();
-        sortAllowed = true;
         linksAllowed = false;
         seeAlso = true;
         // get selected publication ids from session
         selectedIds = processPublicationsToLink(req);
         kmeliaSC.setCurrentFolderId(currentTopic.getNodePK().getId(), true);
+        if (sort != null) {
+          kmeliaSC.getSort().setCurrentSort(sort);
+          kmeliaSC.getSort().setExplicitSort(true);
+        }
         kmeliaSC.loadPublicationsOfCurrentFolder();
         publications = kmeliaSC.getSessionPublicationsList();
       } else if (toPortlet) {
@@ -270,6 +276,10 @@ public void doPost(HttpServletRequest request, HttpServletResponse res) throws I
                 attachmentToLink);
           }
         }
+        //We rollback with previous sort of the topic
+        if (toLink) {
+          kmeliaSC.getSort().setCurrentSort(previousSort);
+        }
       } catch (IOException e) {
         SilverLogger.getLogger(this).error(e);
       }
@@ -824,7 +834,6 @@ void displaySortingListBox(MultiSilverpeasBundle resources, KmeliaSessionControl
           getSortingListBoxEntry(SORT_MANUAL, resources.getString("kmelia.sort.manual"), ksc));
     }
     out.write("</select>");
-
     if (manualSort && SilverpeasRole.ADMIN == ksc.getHighestSilverpeasUserRole()) {
       // Display link to reset manual sort
       Img img = new Img();

diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationLinksManager.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationLinksManager.jsp
@@ -108,8 +108,8 @@
           displayPublications(oArgs.node.data.componentId,getCurrentNodeId());
           //displays the publication localized at the root of a theme tracker
         }else if (oArgs.node.data.nodeType=='COMPONENT' && oArgs.node.data.id.indexOf('kmelia')==0){
-          displayPublications(oArgs.node.data.id,rootTopic);
           setCurrentNodeId(rootTopic);
+          displayPublications(oArgs.node.data.id,rootTopic);
         }else{
           displayHomeMessage();
         }
@@ -123,14 +123,18 @@
     function sortGoTo(selectedIndex) {
       if (selectedIndex !== 0 && selectedIndex !== 1) {
         const sort = document.publicationsForm.sortBy[selectedIndex].value;
-        currentSort = sort;
         const ieFix = new Date().getTime();
         const componentId = currentComponent;
-        $.get(getWebContext()+'/RAjaxPublicationsListServlet',
-            {PubId:pubId,TopicToLinkId:getCurrentNodeId(),ComponentId:componentId, ToLink:1, Sort: sort,IEFix:ieFix},
-            function(data){
-              $('#pubList').html(data);
-            },"html");
+        $.get(getWebContext() + '/RAjaxPublicationsListServlet', {
+          TopicToLinkId : getCurrentNodeId(),
+          ComponentId : componentId,
+          ToLink : 1,
+          Sort : sort,
+          IEFix : ieFix
+        }, function(data) {
+          $('#pubList').html(data);
+        }, "html");
+        return;
       }
     }
 
@@ -144,7 +148,7 @@
 
     function doPagination(index, nbItemsPerPage){
       const ieFix = new Date().getTime();
-      $.get(getWebContext()+'/RAjaxPublicationsListServlet', {PubId:pubId,Index:index,NbItemsPerPage:nbItemsPerPage,ComponentId:currentComponent,ToLink:1,Sort:currentSort,IEFix:ieFix},
+      $.get(getWebContext()+'/RAjaxPublicationsListServlet', {Index:index,NbItemsPerPage:nbItemsPerPage,ComponentId:currentComponent,ToLink:1,Sort:currentSort,IEFix:ieFix},
           function(data){
             $('#pubList').html(data);
           },"html");
@@ -157,7 +161,7 @@
 
     function displayPublications(CompoId,topicId){
       const ieFix = new Date().getTime();
-      $.get(getWebContext()+'/RAjaxPublicationsListServlet', {PubId:pubId,ComponentId:CompoId,TopicToLinkId:topicId,ToLink:1,Sort:currentSort,IEFix:ieFix},
+      $.get(getWebContext()+'/RAjaxPublicationsListServlet', {ComponentId:CompoId,TopicToLinkId:topicId,ToLink:1,Sort:currentSort,IEFix:ieFix},
           function(data){
             $('#pubList').html(data);
           },"html");