inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

. Big and juicy application/WCM model refactoring

Browse Source 
- WARNING: this change requires a new DB as the WCM model has changed significantly, yes I have probably broken a few WCM things :)

Previously the following statements were true:
 - Most of the model constants were defined in the ContentModel class - including web-client Application specific model items
 - WCMModel class was a mix of WCM repository and WCM application model constants
 - The applicationModel.xml definition file contained both web-client Application and WCM application model definitions
 - The wcmModel.xml definition file contained both WCM repository and WCM application model definitions

The following statements are now true:
 - All web-client application specific model constants have been moved from ContentModel to a new model constants class ApplicationModel
 - A new WCM application model has been defined with the prefix "wca" and URI: http://www.alfresco.org/model/wcmappmodel/1.0
 - All WCM application specific model constants have been renamed/moved from ContentModel/WCMModel to a new model constants class WCMAppModel
 - The mix of WCM application specific model definitions in contentModel.xml and applicationModel.xml has been moved to a new definition file wcmAppModel.xml
 - A patch is not required for standard Alfresco as only WCM definitions have actually changed

. Fix to issue created during workflow id/name refactor
. Fix to allow forms in the Available Content Forms panel to have correct sandbox/username context for action dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-11-27 15:03:12 +00:00
parent 8cc57fe41e
commit 6027f1c17d
44 changed files with 323 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java
View File

@@ -11,6 +11,7 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.el.ValueBinding;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -161,25 +162,25 @@ public class UINodeWorkflowInfo extends SelfRenderingComponent
}
out.write("<div class=\"nodeWorkflowInfoText\">");
if (node.hasAspect(ContentModel.ASPECT_SIMPLE_WORKFLOW))
if (node.hasAspect(ApplicationModel.ASPECT_SIMPLE_WORKFLOW))
{
// get the simple workflow aspect properties
Map<String, Object> props = node.getProperties();
String approveStepName = (String)props.get(
ContentModel.PROP_APPROVE_STEP.toString());
ApplicationModel.PROP_APPROVE_STEP.toString());
String rejectStepName = (String)props.get(
ContentModel.PROP_REJECT_STEP.toString());
ApplicationModel.PROP_REJECT_STEP.toString());
Boolean approveMove = (Boolean)props.get(
ContentModel.PROP_APPROVE_MOVE.toString());
ApplicationModel.PROP_APPROVE_MOVE.toString());
Boolean rejectMove = (Boolean)props.get(
ContentModel.PROP_REJECT_MOVE.toString());
ApplicationModel.PROP_REJECT_MOVE.toString());
NodeRef approveFolder = (NodeRef)props.get(
ContentModel.PROP_APPROVE_FOLDER.toString());
ApplicationModel.PROP_APPROVE_FOLDER.toString());
NodeRef rejectFolder = (NodeRef)props.get(
ContentModel.PROP_REJECT_FOLDER.toString());
ApplicationModel.PROP_REJECT_FOLDER.toString());
String approveFolderName = null;
String rejectFolderName = null;

3
source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java
View File

@@ -22,6 +22,7 @@ import java.util.List;
import javax.faces.context.FacesContext;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -143,7 +144,7 @@ public class UISpaceSelector extends AbstractItemSelector
*/
public String getItemIcon(FacesContext context, NodeRef ref)
{
String icon = (String)getNodeService(context).getProperty(ref, ContentModel.PROP_ICON);
String icon = (String)getNodeService(context).getProperty(ref, ApplicationModel.PROP_ICON);
if (icon != null)
{
icon = "/images/icons/" + icon + "-16.gif";

21
source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
View File

@@ -35,6 +35,7 @@ import javax.faces.el.ValueBinding;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
@@ -267,7 +268,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
{
throw new IllegalArgumentException("Website NodeRef must be specified.");
}
String storeRoot = (String)nodeService.getProperty(websiteRef, ContentModel.PROP_AVMSTORE);
String storeRoot = (String)nodeService.getProperty(websiteRef, WCMAppModel.PROP_AVMSTORE);
// find out if this user is a Content Manager
boolean isManager = isManagerRole(context, nodeService, websiteRef);
@@ -275,12 +276,12 @@ public class UIUserSandboxes extends SelfRenderingComponent
// get the list of users who have a sandbox in the website
int index = 0;
List<ChildAssociationRef> userInfoRefs = nodeService.getChildAssocs(
websiteRef, ContentModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
websiteRef, WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef ref : userInfoRefs)
{
NodeRef userInfoRef = ref.getChildRef();
String username = (String)nodeService.getProperty(userInfoRef, ContentModel.PROP_WEBUSERNAME);
String userrole = (String)nodeService.getProperty(userInfoRef, ContentModel.PROP_WEBUSERROLE);
String username = (String)nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERNAME);
String userrole = (String)nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERROLE);
// create the lookup value of sandbox index to username
this.userToRowLookup.put(index, username);
@@ -433,12 +434,12 @@ public class UIUserSandboxes extends SelfRenderingComponent
{
String currentUser = user.getUserName();
List<ChildAssociationRef> userInfoRefs = nodeService.getChildAssocs(
websiteRef, ContentModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
websiteRef, WCMAppModel.ASSOC_WEBUSER, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef ref : userInfoRefs)
{
NodeRef userInfoRef = ref.getChildRef();
String username = (String)nodeService.getProperty(userInfoRef, ContentModel.PROP_WEBUSERNAME);
String userrole = (String)nodeService.getProperty(userInfoRef, ContentModel.PROP_WEBUSERROLE);
String username = (String)nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERNAME);
String userrole = (String)nodeService.getProperty(userInfoRef, WCMAppModel.PROP_WEBUSERROLE);
if (currentUser.equals(username) && ROLE_CONTENT_MANAGER.equals(userrole))
{
isManager = true;
@@ -699,7 +700,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
if (this.forms == null)
{
List<ChildAssociationRef> webFormRefs = nodeService.getChildAssocs(
websiteRef, ContentModel.ASSOC_WEBFORM, RegexQNamePattern.MATCH_ALL);
websiteRef, WCMAppModel.ASSOC_WEBFORM, RegexQNamePattern.MATCH_ALL);
this.forms = new ArrayList<NodeRef>(webFormRefs.size());
for (ChildAssociationRef ref : webFormRefs)
{
@@ -737,9 +738,11 @@ public class UIUserSandboxes extends SelfRenderingComponent
if (action == null)
{
// create content action passes the ID of the Form to uses
Map<String, String> params = new HashMap<String, String>(1, 1.0f);
Map<String, String> params = new HashMap<String, String>(3, 1.0f);
// setup a data-binding param for the Form ID
params.put(PARAM_FORM_ID, "#{" + REQUEST_FORM_REF + ".id}");
params.put("username", username);
params.put("store", userStorePrefix);
action = createAction(fc, userStorePrefix, username, ACT_CREATE_FORM_CONTENT,
"/images/icons/new_content.gif", "#{AVMBrowseBean.createFormContent}", null, null, params);
}