From ddc1d285c9ec5cbcec9ea420bafa57fe143ebe7b Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Thu, 27 Sep 2007 21:54:43 +0000
Subject: [PATCH] Changed the EditNodeCategories dialog to take a nodeRef
 rather than an id

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/bean/categories/EditNodeCategoriesDialog.java     | 8 ++++----
 source/java/org/alfresco/web/bean/repository/Node.java    | 8 ++++++++
 source/web/jsp/dialog/document-details.jsp                | 2 +-
 source/web/jsp/dialog/space-details.jsp                   | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
index 472ba9d105..b48c9d0761 100644
--- a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
+++ b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
@@ -67,13 +67,13 @@ public class EditNodeCategoriesDialog extends BaseDialogBean
       this.addedCategory = null;
       
       // retrieve parameters
-      String id = parameters.get("id");
+      String nodeRef = parameters.get("nodeRef");
       
-      // make sure id was supplied
-      ParameterCheck.mandatoryString("id", id);
+      // make sure nodeRef was supplied
+      ParameterCheck.mandatoryString("nodeRef", nodeRef);
       
       // create the node
-      this.node = new Node(new NodeRef(Repository.getStoreRef(), id));
+      this.node = new Node(new NodeRef(nodeRef));
       
       // determine description for dialog
       FacesContext context = FacesContext.getCurrentInstance();
diff --git a/source/java/org/alfresco/web/bean/repository/Node.java b/source/java/org/alfresco/web/bean/repository/Node.java
index c0755f0ae6..f613fe9ec0 100644
--- a/source/java/org/alfresco/web/bean/repository/Node.java
+++ b/source/java/org/alfresco/web/bean/repository/Node.java
@@ -282,6 +282,14 @@ public class Node implements Serializable
       return this.nodeRef;
    }
    
+   /**
+    * @return Returns the string form of the NodeRef this Node represents
+    */
+   public final String getNodeRefAsString()
+   {
+      return this.nodeRef.toString();
+   }
+   
    /**
     * @return Returns the type.
     */
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index 838a5aaf54..8461e13936 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -406,7 +406,7 @@
                                     <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write">
                                        <a:actionLink id="titleLink3" value="#{msg.change_category}" showLink="false" image="/images/icons/Change_details.gif"
                                              action="dialog:editNodeCategories" actionListener="#{DialogManager.setupParameters}">
-                                          <f:param name="id" value="#{DocumentDetailsBean.document.id}" />
+                                          <f:param name="nodeRef" value="#{DocumentDetailsBean.document.nodeRefAsString}" />
                                        </a:actionLink>
                                     </r:permissionEvaluator>
                                  </f:facet>
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
index 451fd38f34..923116559a 100644
--- a/source/web/jsp/dialog/space-details.jsp
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -254,7 +254,7 @@
                                     <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
                                        <a:actionLink id="titleLink3" value="#{msg.change_category}" showLink="false" image="/images/icons/Change_details.gif"
                                              action="dialog:editNodeCategories" actionListener="#{DialogManager.setupParameters}">
-                                          <f:param name="id" value="#{SpaceDetailsBean.space.id}" />
+                                          <f:param name="nodeRef" value="#{SpaceDetailsBean.space.nodeRefAsString}" />
                                        </a:actionLink>
                                     </r:permissionEvaluator>
                                  </f:facet>