CMS-7919: Editing Page and Viewing Revision History and then Promotin…

WebUI/war/plugins/PercRevisionDialog.js

@@ -203,6 +203,8 @@
             {
                 $("#revisionsTable").find(".perc-revisions-restore-img").click(function(){
                     var revId = $(this).attr("revId");
+                    dialog.remove();
+                    $.PercBlockUI($.PercBlockUIMode.CURSORONLY);
                     $.PercRevisionService.restoreRevision(itemId,revId,afterRestore);
                 })
                 .bind("mouseenter", function(){
@@ -262,14 +264,14 @@
         function afterRestore(status,result)
         {
             var self = this;
-
+            $.unblockUI();
             if(status == $.PercServiceUtils.STATUS_ERROR)
-            { 
+            {
                 var defaultMsg = $.PercServiceUtils.extractDefaultErrorMessage(result.request);
                 $.perc_utils.alert_dialog({title: I18N.message("perc.ui.publish.title@Error"), content: defaultMsg});
                 return;
             }
-            dialog.remove();
+
             $.PercNavigationManager.setReopenAllowed(true);
             var item = {
                     "id": $.PercNavigationManager.getId(),

WebUI/war/services/PercRevisionService.js

@@ -79,12 +79,12 @@
         ida[0] = revId;
         itemId = ida.join("-");
         var url = $.perc_paths.ITEM_PROMOTE_REVISION + "/" + itemId;
-        $.PercServiceUtils.makeJsonRequest(url,$.PercServiceUtils.TYPE_GET,true,callback);
+        $.PercServiceUtils.makeJsonRequest(url,$.PercServiceUtils.TYPE_GET,false,callback);
     }
 
     function getLastComment(itemId, callback){
         var url = $.perc_paths.ITEM_LAST_COMMENT + "/" + itemId;
-        $.PercServiceUtils.makeRequest(url,$.PercServiceUtils.TYPE_GET,true,callback);    
+        $.PercServiceUtils.makeRequest(url,$.PercServiceUtils.TYPE_GET,false,callback);
     }
 })(jQuery);
 

modules/extensions-main/src/main/java/com/percussion/extensions/ca/PSDeleteContent.java

@@ -180,8 +180,7 @@ public void preProcessRequest(Object[] params, IPSRequestContext request)
             }
 
             // get all owner relationships for the current content id
-            PSRelationshipDbProcessor processor = 
-               new PSRelationshipDbProcessor(request);
+            PSRelationshipDbProcessor processor = PSRelationshipDbProcessor.getInstance();
             PSRelationshipFilter filter = new PSRelationshipFilter();
             int itemId = Integer.parseInt(request
                   .getParameter(IPSHtmlParameters.SYS_CONTENTID));

projects/sitemanage/src/main/java/com/percussion/itemmanagement/service/impl/PSItemService.java

@@ -314,28 +314,15 @@ public PSNoContent restoreRevision(@PathParam("id") String id) throws PSItemServ
         //If item can't be restored this method throws exception with a business message.
         validateItemRestorable(id);
 
-        PSComponentSummary sum = workflowHelper.getComponentSummary(id);
-
         //Create a list of ids and add the supplied item id first.
         List<String> ids = new ArrayList<String>();
         ids.add(id);
 
-        //get all the local content items related to that revision and add them to the list.
-        Set<String> lids = waRelService.getLocalAssets(id);
-        ids.addAll(lids);
-
         try
         {
             //prepare the item for promotion
            	prepareForRestore(id);
         	contentWs.promoteRevisions(idMapper.getGuids(ids));
-            //Adjust the relationships
-        	sum = workflowHelper.getComponentSummary(id);
-            String cid = idMapper.getGuid(sum.getHeadLocator()).toString();
-            if(lids.size()>0)
-            {
-            	waRelService.adjustLocalContentRelationships(cid);
-            }
         }
         catch (Exception e)
         {

system/services/src/com/percussion/services/purge/impl/PSSqlPurgeHelper.java

@@ -793,7 +793,7 @@ private void filterLinkedItems(Set<Integer> foldersToCheck, Map<Integer, Set<Int
    {
       PSRequest req = (PSRequest) PSRequestInfo.getRequestInfo(PSRequestInfo.KEY_PSREQUEST);
       PSFolderSecurityManager.setCheckFolderPermissions(false);
-      PSRelationshipDbProcessor relProcessor = new PSRelationshipDbProcessor(req);
+      PSRelationshipDbProcessor relProcessor = PSRelationshipDbProcessor.getInstance();
 
       try
       {

system/src/com/percussion/cms/handlers/PSCloneCommandHandler.java

@@ -391,8 +391,7 @@ public static Map copyRelatedContent(int fromCid, int fromRid,
       params.put(IPSHtmlParameters.SYS_CONTENTID, Integer.toString(fromCid));
       params.put(IPSHtmlParameters.SYS_REVISION, Integer.toString(fromRid));
 
-      PSRelationshipDbProcessor processor = 
-         new PSRelationshipDbProcessor(request);
+      PSRelationshipDbProcessor processor = PSRelationshipDbProcessor.getInstance();
 
       Map inlineRelationships = new HashMap();
 

system/src/com/percussion/cms/handlers/PSRelationshipCommandHandler.java

@@ -195,8 +195,7 @@ public void relate(String relationshipType, PSLocator owner,
                   relationshipType);
          }
 
-         PSRelationshipDbProcessor processor = new PSRelationshipDbProcessor(
-               data.getRequest());
+         PSRelationshipDbProcessor processor = PSRelationshipDbProcessor.getInstance();
          putRelationship(data, config, -1, owner, dependent,
             PSApplicationBuilder.REQUEST_TYPE_VALUE_INSERT, false, processor);
       }
@@ -440,8 +439,7 @@ private boolean processRequest(PSExecutionData data)
          String command = getParameter(data.getRequest(),
             IPSHtmlParameters.SYS_COMMAND);
 
-         PSRelationshipDbProcessor processor = new PSRelationshipDbProcessor(
-               data.getRequest());
+         PSRelationshipDbProcessor processor = PSRelationshipDbProcessor.getInstance();
 
          if (command.equals(COMMAND_NAME) ||
             command.equals(COMMAND_NAME + "/" + COMMAND_CREATE))

system/src/com/percussion/cms/objectstore/server/PSRelationshipProcessor.java

@@ -293,8 +293,26 @@ public PSComponentSummary[] getChildren(
    public PSRelationship checkIfRelationshipAlreadyExists(PSRelationship rel){
       PSRelationshipProcessor processor = PSRelationshipProcessor.getInstance();
       PSRelationshipFilter filter = new PSRelationshipFilter();
-      filter.setDependentId(rel.getDependent().getId());
-      filter.setOwnerId(rel.getOwner().getId());
+
+      String name = rel.getConfig().getName();
+      if (name != null && name.trim().length() > 0)
+         filter.setName(name);
+
+      int ownerId = rel.getOwner().getId();
+      if (ownerId != -1)
+      {
+         int rev = rel.getOwner().getRevision();
+         filter.setOwner(new PSLocator(ownerId, rev));
+      }
+
+      int dependentId = rel.getDependent().getId();
+      if (dependentId != -1)
+         filter.setDependent(new PSLocator(dependentId, rel.getDependent().getRevision()));
+
+      String slotId = rel.getProperty(IPSHtmlParameters.SYS_SLOTID);
+      if (slotId != null && !slotId.trim().isEmpty())
+         filter.setProperty(IPSHtmlParameters.SYS_SLOTID, slotId + "");
+
       try {
          PSRelationshipSet relSet = processor.getRelationships(filter);
          for (int i = 0; i < relSet.size(); i++)

system/src/com/percussion/relationship/effect/PSPromote.java

@@ -478,8 +478,7 @@ private void repointRelationships(IPSRequestContext request,
       PSRelationshipSet relationshipsToModify = new PSRelationshipSet();
       PSRelationshipSet relationshipsToDelete = new PSRelationshipSet();
 
-      PSRelationshipDbProcessor processor =
-         new PSRelationshipDbProcessor(request);
+      PSRelationshipDbProcessor processor = PSRelationshipDbProcessor.getInstance();
 
       //get all outbound relationships (orig item is the owner item)
       PSRelationshipFilter filter = new PSRelationshipFilter();