immutabilty = null;
+
+
+ // ------------------------------------------------------------------------------
+ // Bean property getters and setters
/**
- * @param nodeService The NodeService to set.
- */
- public void setNodeService(NodeService nodeService)
- {
- this.nodeService = nodeService;
- }
+ * @return the nodeService
+ */
+ public NodeService getNodeService()
+ {
+ if (nodeService == null)
+ {
+ nodeService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getNodeService();
+ }
+ return nodeService;
+ }
- /**
- * @param searchService the search service
- */
- public void setSearchService(SearchService searchService)
- {
- this.searchService = searchService;
- }
+ /**
+ * @return the searchService
+ */
+ public SearchService getSearchService()
+ {
+ if (searchService == null)
+ {
+ searchService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getSearchService();
+ }
+ return searchService;
+ }
- /**
- * @param authenticationService The AuthenticationService to set.
- */
- public void setAuthenticationService(MutableAuthenticationService authenticationService)
- {
- this.authenticationService = authenticationService;
- }
+ /**
+ * @return the authenticationService
+ */
+ public MutableAuthenticationService getAuthenticationService()
+ {
+ if (authenticationService == null)
+ {
+ authenticationService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAuthenticationService();
+ }
+ return authenticationService;
+ }
- /**
- * @param personService The PersonService to set.
- */
- public void setPersonService(PersonService personService)
- {
- this.personService = personService;
- }
-
- /**
- * @param contentUsageService The ContentUsageService to set.
- */
- public void setContentUsageService(ContentUsageService contentUsageService)
- {
- this.contentUsageService = contentUsageService;
- }
+ /**
+ * @return the personService
+ */
+ public PersonService getPersonService()
+ {
+ if (personService == null)
+ {
+ personService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getPersonService();
+ }
+ return personService;
+ }
- /**
- * @return Returns the usersRichList.
- */
- public UIRichList getUsersRichList()
- {
- return this.usersRichList;
- }
+ /**
+ * @return contentUsageService
+ */
+ public ContentUsageService getContentUsageService()
+ {
+ if (contentUsageService == null)
+ {
+ contentUsageService = (ContentUsageService) FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "ContentUsageService");
+ }
+ return contentUsageService;
+ }
+
+ /**
+ * @return userRegistrySynchronizer
+ */
+ public UserRegistrySynchronizer getUserRegistrySynchronizer()
+ {
+ if (userRegistrySynchronizer == null)
+ {
+ userRegistrySynchronizer = (UserRegistrySynchronizer)FacesContextUtils.getRequiredWebApplicationContext(
+ FacesContext.getCurrentInstance()).getBean("userRegistrySynchronizer");
+ }
+ return userRegistrySynchronizer;
+ }
+
+ /**
+ * @param nodeService The NodeService to set.
+ */
+ public void setNodeService(NodeService nodeService)
+ {
+ this.nodeService = nodeService;
+ }
- /**
- * @param usersRichList The usersRichList to set.
- */
- public void setUsersRichList(UIRichList usersRichList)
- {
- this.usersRichList = usersRichList;
- }
+ /**
+ * @param searchServiceq the search service
+ */
+ public void setSearchService(SearchService searchService)
+ {
+ this.searchService = searchService;
+ }
- /**
- * @return Returns the search criteria
- */
- public String getSearchCriteria()
- {
- return searchCriteria;
- }
+ /**
+ * @param authenticationService The AuthenticationService to set.
+ */
+ public void setAuthenticationService(MutableAuthenticationService authenticationService)
+ {
+ this.authenticationService = authenticationService;
+ }
- /**
- * @param searchCriteria The search criteria to select
- */
- public void setSearchCriteria(String searchCriteria)
- {
- this.searchCriteria = searchCriteria;
- }
+ /**
+ * @param personService The PersonService to set.
+ */
+ public void setPersonService(PersonService personService)
+ {
+ this.personService = personService;
+ }
- /**
- * @return Returns the confirm password.
- */
- public String getConfirm()
- {
- return this.confirm;
- }
+ /**
+ * @param contentUsageService The ContentUsageService to set.
+ */
+ public void setContentUsageService(ContentUsageService contentUsageService)
+ {
+ this.contentUsageService = contentUsageService;
+ }
+
+ /**
+ * @param userRegistrySynchronizer
+ */
+ public void setUserRegistrySynchronizer(UserRegistrySynchronizer userRegistrySynchronizer)
+ {
+ this.userRegistrySynchronizer = userRegistrySynchronizer;
+ }
- /**
- * @param confirm The confirm password to set.
- */
- public void setConfirm(String confirm)
- {
- this.confirm = confirm;
- }
+ /**
+ * @return Returns the usersRichList.
+ */
+ public UIRichList getUsersRichList()
+ {
+ return this.usersRichList;
+ }
- /**
- * @return Returns the password.
- */
- public String getPassword()
- {
- return this.password;
- }
+ /**
+ * @param usersRichList The usersRichList to set.
+ */
+ public void setUsersRichList(UIRichList usersRichList)
+ {
+ this.usersRichList = usersRichList;
+ }
- /**
- * @param password The password to set.
- */
- public void setPassword(String password)
- {
- this.password = password;
- }
-
- /**
- * @return Returns the old password.
- */
- public String getOldPassword()
- {
- return this.oldPassword;
- }
+ /**
+ * @return Returns the search criteria
+ */
+ public String getSearchCriteria()
+ {
+ return searchCriteria;
+ }
- /**
- * @param oldPassword The old password to set.
- */
- public void setOldPassword(String oldPassword)
- {
- this.oldPassword = oldPassword;
- }
+ /**
+ * @param searchCriteria The search criteria to select
+ */
+ public void setSearchCriteria(String searchCriteria)
+ {
+ this.searchCriteria = searchCriteria;
+ }
- /**
- * @return Returns the person context.
- */
- public Node getPerson()
- {
- return this.person;
- }
+ /**
+ * @return Returns the confirm password.
+ */
+ public String getConfirm()
+ {
+ return this.confirm;
+ }
- /**
- * @param person The person context to set.
- */
- public void setPerson(Node person)
- {
- this.person = person;
- this.userName = (String)person.getProperties().get(ContentModel.PROP_USERNAME);
- }
-
- public Long getUserUsage(String userName)
- {
- long usage = getContentUsageService().getUserUsage(userName);
- return (usage == -1 ? null : usage);
- }
-
- public Long getUserUsage()
- {
- long usage = getContentUsageService().getUserUsage(this.userName);
- return (usage == -1 ? null : usage);
- }
-
- public Long getUserQuota()
- {
- long quota = getContentUsageService().getUserQuota(this.userName);
- return (quota == -1 ? null : quota);
- }
-
- public boolean getUsagesEnabled()
- {
- return getContentUsageService().getEnabled();
- }
-
- public String getPersonDescription()
- {
- ContentService cs = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getContentService();
- ContentReader reader = cs.getReader(this.person.getNodeRef(), ContentModel.PROP_PERSONDESC);
- if (reader != null && reader.exists())
- {
- return Utils.stripUnsafeHTMLTags(reader.getContentString()).replace("\r\n", "");
- }
- else
- {
- return null;
- }
- }
-
- public String getAvatarUrl()
- {
- String avatarUrl = null;
-
- List refs = getNodeService().getTargetAssocs(this.person.getNodeRef(), ContentModel.ASSOC_AVATAR);
- if (refs.size() == 1)
- {
- NodeRef photoRef = refs.get(0).getTargetRef();
- String name = (String)getNodeService().getProperty(photoRef, ContentModel.PROP_NAME);
- avatarUrl = DownloadContentServlet.generateBrowserURL(photoRef, name);
- }
-
- return avatarUrl;
- }
+ /**
+ * @param confirm The confirm password to set.
+ */
+ public void setConfirm(String confirm)
+ {
+ this.confirm = confirm;
+ }
+
+ /**
+ * @return Returns the password.
+ */
+ public String getPassword()
+ {
+ return this.password;
+ }
+
+ /**
+ * @param password The password to set.
+ */
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ /**
+ * @return Returns the old password.
+ */
+ public String getOldPassword()
+ {
+ return this.oldPassword;
+ }
+
+ /**
+ * @param oldPassword The old password to set.
+ */
+ public void setOldPassword(String oldPassword)
+ {
+ this.oldPassword = oldPassword;
+ }
+
+ /**
+ * @return Returns the person context.
+ */
+ public Node getPerson()
+ {
+ return this.person;
+ }
+
+ /**
+ * @param person The person context to set.
+ */
+ public void setPerson(final Node p)
+ {
+ // perform the set in a txn as certain bean calls require it
+ FacesContext context = FacesContext.getCurrentInstance();
+ RetryingTransactionHelper txnHelper = Repository.getRetryingTransactionHelper(context);
+ RetryingTransactionCallback callback = new RetryingTransactionCallback()
+ {
+ public Object execute() throws Throwable
+ {
+ person = p;
+ userName = (String)person.getProperties().get(ContentModel.PROP_USERNAME);
+
+ // rebuild the property immutability map helper object
+ immutabilty = new PropertyImmutabilityMap(
+ getUserRegistrySynchronizer().getPersonMappedProperties(userName));
+
+ return null;
+ }
+ };
+ try
+ {
+ txnHelper.doInTransaction(callback, false);
+ }
+ catch (Throwable e)
+ {
+ // reset the flag so we can re-attempt the operation
+ if (e instanceof ReportedException == false)
+ {
+ Utils.addErrorMessage(e.getMessage(), e);
+ }
+ ReportedException.throwIfNecessary(e);
+ }
+ }
+
+ public Long getUserUsage(String userName)
+ {
+ long usage = getContentUsageService().getUserUsage(userName);
+ return (usage == -1 ? null : usage);
+ }
+
+ public Long getUserUsage()
+ {
+ long usage = getContentUsageService().getUserUsage(this.userName);
+ return (usage == -1 ? null : usage);
+ }
+
+ public Long getUserQuota()
+ {
+ long quota = getContentUsageService().getUserQuota(this.userName);
+ return (quota == -1 ? null : quota);
+ }
+
+ public boolean getUsagesEnabled()
+ {
+ return getContentUsageService().getEnabled();
+ }
+
+ public String getPersonDescription()
+ {
+ ContentService cs = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getContentService();
+ ContentReader reader = cs.getReader(this.person.getNodeRef(), ContentModel.PROP_PERSONDESC);
+ if (reader != null && reader.exists())
+ {
+ return Utils.stripUnsafeHTMLTags(reader.getContentString()).replace("\r\n", "");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public String getAvatarUrl()
+ {
+ String avatarUrl = null;
+
+ List refs = getNodeService().getTargetAssocs(this.person.getNodeRef(), ContentModel.ASSOC_AVATAR);
+ if (refs.size() == 1)
+ {
+ NodeRef photoRef = refs.get(0).getTargetRef();
+ String name = (String) getNodeService().getProperty(photoRef, ContentModel.PROP_NAME);
+ avatarUrl = DownloadContentServlet.generateBrowserURL(photoRef, name);
+ }
+
+ return avatarUrl;
+ }
+
+ public Map getImmutability()
+ {
+ return this.immutabilty;
+ }
+
+ /**
+ * Map of person property to immutability
+ * The Map interface is implemented to allow JSF expressions such as
+ * #{DialogBean.bean.properties.immutability.propertyname}
+ */
+ public class PropertyImmutabilityMap implements Map, Serializable
+ {
+ final private Set props;
+
+ PropertyImmutabilityMap(Set props)
+ {
+ this.props = props;
+ }
+
+ public void clear()
+ {
+ }
+
+ public boolean containsKey(Object k)
+ {
+ boolean contains = false;
+ if (k instanceof String && ((String)k).length() != 0)
+ {
+ String s = (String)k;
+ if (s.charAt(0) == '{' && s.indexOf('}') != -1)
+ {
+ contains = this.props.contains(k);
+ }
+ else
+ {
+ // simple property name - assume and apply CM namespace
+ contains = this.props.contains(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, s));
+ }
+ }
+ return contains;
+ }
+
+ public boolean containsValue(Object v)
+ {
+ return false;
+ }
+
+ public Set> entrySet()
+ {
+ return null;
+ }
+
+ public Boolean get(Object k)
+ {
+ return containsKey(k);
+ }
+
+ public boolean isEmpty()
+ {
+ return this.props.size() != 0;
+ }
+
+ public Set keySet()
+ {
+ return null;
+ }
+
+ public Boolean put(String k, Boolean v)
+ {
+ return null;
+ }
+
+ public void putAll(Map m)
+ {
+ }
+
+ public Boolean remove(Object k)
+ {
+ return null;
+ }
+
+ public int size()
+ {
+ return this.props.size();
+ }
+
+ public Collection values()
+ {
+ return null;
+ }
+ }
}
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
index f2d35e2b15..fa4ad3f206 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
@@ -464,11 +464,21 @@ public class CreateWebContentWizard extends CreateContentWizard
if (MimetypeMap.MIMETYPE_XML.equals(this.mimeType) && this.formName != null)
{
- this.formInstanceData = getFormsService().getFormInstanceData(-1, this.createdPath);
- this.renditions = this.formInstanceData.getRenditions();
- if (logger.isDebugEnabled())
- logger.debug("reset form instance data " + this.formInstanceData.getName() +
- " and " + this.renditions.size() + " rendition(s) to main store");
+ try
+ {
+ this.formInstanceData = getFormsService().getFormInstanceData(-1, this.createdPath);
+ this.renditions = this.formInstanceData.getRenditions();
+
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("reset form instance data " + this.formInstanceData.getName() +
+ " and " + this.renditions.size() + " rendition(s) to main store");
+ }
+ }
+ catch (FormNotFoundException fnfe)
+ {
+ logger.warn(fnfe);
+ }
}
this.avmBrowseBean.setAvmActionNode(new AVMNode(this.getAvmService().lookup(-1, this.createdPath)));
diff --git a/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java b/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java
index 6005b33936..8ba3b37734 100644
--- a/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java
@@ -33,6 +33,7 @@ import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.forms.*;
+import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -189,7 +190,6 @@ public class DeleteFileDialog extends BaseDialogBean
node.getName(),
fid.getName(),
fid.getRenditions().size() - 1);
-
}
catch (FileNotFoundException fnfe)
{
@@ -198,11 +198,18 @@ public class DeleteFileDialog extends BaseDialogBean
}
else if (node.hasAspect(WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
{
- final FormInstanceData fid = this.getFormsService().getFormInstanceData(node.getNodeRef());
- return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
- "delete_form_instance_data_confirm"),
- fid.getName(),
- fid.getRenditions().size());
+ try
+ {
+ final FormInstanceData fid = this.getFormsService().getFormInstanceData(node.getNodeRef());
+ return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
+ "delete_form_instance_data_confirm"),
+ fid.getName(),
+ fid.getRenditions().size());
+ }
+ catch (FormNotFoundException fnfe)
+ {
+ // ignore
+ }
}
return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
"delete_avm_file_confirm"),
diff --git a/source/java/org/alfresco/web/bean/wcm/EditWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/EditWebContentWizard.java
index fde3d7089b..c4468a5117 100644
--- a/source/java/org/alfresco/web/bean/wcm/EditWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditWebContentWizard.java
@@ -18,10 +18,11 @@
*/
package org.alfresco.web.bean.wcm;
-import java.util.ArrayList;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.service.cmr.avm.locking.AVMLock;
@@ -48,7 +49,7 @@ public class EditWebContentWizard extends CreateWebContentWizard
private AVMNode avmNode;
private Form form;
- protected List locksPresentAtInit = null;
+ protected Set existingLocks = null;
// ------------------------------------------------------------------------------
// Wizard implementation
@@ -67,11 +68,14 @@ public class EditWebContentWizard extends CreateWebContentWizard
logger.debug("path is " + this.avmNode.getPath());
this.createdPath = AVMUtil.getCorrespondingPathInPreviewStore(this.avmNode.getPath());
- this.formInstanceData = this.getFormsService().getFormInstanceData(-1, this.createdPath);
final WebProject webProject = new WebProject(this.createdPath);
+
try
{
+ this.formInstanceData = this.getFormsService().getFormInstanceData(-1, this.createdPath);
this.formName = this.formInstanceData.getForm().getName();
+ this.fileName = this.formInstanceData.getName();
+
this.form = webProject.getForm(this.formName);
}
catch (FormNotFoundException fnfe)
@@ -79,16 +83,15 @@ public class EditWebContentWizard extends CreateWebContentWizard
Utils.addErrorMessage(fnfe.getMessage(), fnfe);
}
this.content = this.getAvmService().getContentReader(-1, this.createdPath).getContentString();
- this.fileName = this.formInstanceData.getName();
this.mimeType = MimetypeMap.MIMETYPE_XML;
// calculate which locks are present at init time
- this.locksPresentAtInit = new ArrayList(4);
+ this.existingLocks = new HashSet(4);
AVMLock lock = this.getAvmLockingService().getLock(AVMUtil.getStoreId(this.createdPath),
AVMUtil.getStoreRelativePath(this.createdPath));
if (lock != null)
{
- this.locksPresentAtInit.add(this.createdPath);
+ this.existingLocks.add(this.createdPath);
if (logger.isDebugEnabled())
logger.debug("Lock exists for xml instance " + this.createdPath + " at initialisation");
@@ -101,7 +104,7 @@ public class EditWebContentWizard extends CreateWebContentWizard
AVMUtil.getStoreRelativePath(path));
if (lock != null)
{
- this.locksPresentAtInit.add(path);
+ this.existingLocks.add(path);
if (logger.isDebugEnabled())
logger.debug("Lock exists for rendition " + path + " at initialisation");
@@ -114,9 +117,9 @@ public class EditWebContentWizard extends CreateWebContentWizard
{
if (this.formInstanceData != null && this.renditions != null)
{
- if (this.locksPresentAtInit.contains(this.createdPath) == false)
+ if (this.existingLocks.contains(this.createdPath) == false)
{
- // there wasn't a lock on the form at the start of the
+ // there wasn't an existing lock on the form at the start of the
// wizard so remove the one present now
if (logger.isDebugEnabled())
logger.debug("removing form instance data lock from " +
@@ -126,12 +129,12 @@ public class EditWebContentWizard extends CreateWebContentWizard
this.getAvmLockingService().removeLock(AVMUtil.getStoreId(this.createdPath),
AVMUtil.getStoreRelativePath(this.createdPath));
}
-
+
for (Rendition r : this.renditions)
{
String path = r.getPath();
- if (this.locksPresentAtInit.contains(path) == false)
+ if (this.existingLocks.contains(path) == false)
{
// there wasn't a lock on the rendition at the start of
// the wizard so remove the one present now
@@ -139,7 +142,7 @@ public class EditWebContentWizard extends CreateWebContentWizard
logger.debug("removing lock from rendition " +
AVMUtil.getCorrespondingPathInMainStore(path) +
" as user chose to cancel and it wasn't present at initialisation");
-
+
this.getAvmLockingService().removeLock(AVMUtil.getStoreId(path),
AVMUtil.getStoreRelativePath(path));
}
@@ -222,8 +225,13 @@ public class EditWebContentWizard extends CreateWebContentWizard
// if the renditions were locked before the regenerate, move the lock back to main store
String path = rr.getPath();
- if (this.locksPresentAtInit.contains(path))
+ if (rr.getExistingLock() != null)
{
+ this.existingLocks.add(path);
+ }
+
+ if (this.existingLocks.contains(path))
+ {
if (logger.isDebugEnabled())
logger.debug("transferring existing lock for " + path +
" back to " + AVMUtil.getCorrespondingMainStoreName(AVMUtil.getStoreName(path)));
@@ -241,14 +249,21 @@ public class EditWebContentWizard extends CreateWebContentWizard
final Rendition r = rr.getRendition();
this.renditions.add(r);
+ String path = r.getPath();
+
+ if (rr.getExistingLock() != null)
+ {
+ this.existingLocks.add(path);
+ }
+
if (logger.isDebugEnabled())
- logger.debug("transferring lock for " + r.getPath() +
- " back to " + AVMUtil.getCorrespondingMainStoreName(AVMUtil.getStoreName(r.getPath())));
+ logger.debug("transferring lock for " + path +
+ " back to " + AVMUtil.getCorrespondingMainStoreName(AVMUtil.getStoreName(path)));
- this.getAvmLockingService().modifyLock(AVMUtil.getStoreId(r.getPath()),
- AVMUtil.getStoreRelativePath(r.getPath()),
+ this.getAvmLockingService().modifyLock(AVMUtil.getStoreId(path),
+ AVMUtil.getStoreRelativePath(path),
null,
- AVMUtil.getCorrespondingMainStoreName(AVMUtil.getStoreName(r.getPath())),
+ AVMUtil.getCorrespondingMainStoreName(AVMUtil.getStoreName(path)),
null,
null);
}
diff --git a/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java b/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java
index c3a9dd24b4..67288b6167 100644
--- a/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java
@@ -144,9 +144,11 @@ public class PromptForWebFormDialog extends BaseDialogBean
WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
{
// build a status message if this is an error case
- final FormInstanceData fid = this.getFormsService().getFormInstanceData(this.getAvmNode().getVersion(), avmPath);
+
+ FormInstanceData fid = null;
try
{
+ fid = this.getFormsService().getFormInstanceData(this.getAvmNode().getVersion(), avmPath);
final Form f = fid.getForm();
this.formName = f.getName();
@@ -162,14 +164,19 @@ public class PromptForWebFormDialog extends BaseDialogBean
? "prompt_for_web_form_form_not_found_error_in_web_project"
: "prompt_for_web_form_form_not_found_error");
msg = Application.getMessage(FacesContext.getCurrentInstance(), msg);
- msg = (fnfe.getWebProject() != null
- ? MessageFormat.format(msg,
- fnfe.getFormName(),
- fid.getName(),
- fnfe.getWebProject().getName())
- : MessageFormat.format(msg,
- fnfe.getFormName(),
- fid.getName()));
+
+ if (fid != null)
+ {
+ msg = (fnfe.getWebProject() != null
+ ? MessageFormat.format(msg,
+ fnfe.getFormName(),
+ fid.getName(),
+ fnfe.getWebProject().getName())
+ : MessageFormat.format(msg,
+ fnfe.getFormName(),
+ fid.getName()));
+ }
+
this.avmBrowseBean.displayStatusMessage(FacesContext.getCurrentInstance(), msg);
}
}
diff --git a/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java b/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
index a94defbbc8..1550d51d9e 100644
--- a/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/RegenerateRenditionsWizard.java
@@ -525,7 +525,16 @@ public class RegenerateRenditionsWizard
{
final String avmPath = AVMNodeConverter.ToAVMVersionPath(row.getNodeRef()).getSecond();
final String previewAvmPath = AVMUtil.getCorrespondingPathInPreviewStore(avmPath);
- result.add(getFormsService().getFormInstanceData(-1, previewAvmPath));
+
+ try
+ {
+ FormInstanceData fid = getFormsService().getFormInstanceData(-1, previewAvmPath);
+ result.add(fid);
+ }
+ catch (final FormNotFoundException fnfe)
+ {
+ // ignore
+ }
}
return result;
@@ -661,9 +670,10 @@ public class RegenerateRenditionsWizard
if (this.regenerateScope.equals(REGENERATE_SCOPE_ALL) ||
this.regenerateScope.equals(REGENERATE_SCOPE_FORM))
{
- final FormInstanceData fid = this.formsService.getFormInstanceData(-1, previewAvmPath);
+ FormInstanceData fid = null;
try
{
+ fid = this.formsService.getFormInstanceData(-1, previewAvmPath);
final List regenResults = fid.regenerateRenditions();
for (final FormInstanceData.RegenerateResult rr : regenResults)
{
@@ -687,7 +697,7 @@ public class RegenerateRenditionsWizard
}
catch (FormNotFoundException fnfe)
{
- logger.warn("regenerating renditions of " + fid.getPath() + ": " + fnfe.getMessage(), fnfe);
+ logger.warn("regenerating renditions of " + previewAvmPath + ": " + fnfe.getMessage(), fnfe);
}
}
else
diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index 640141c73d..f0872bd8f2 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -59,7 +59,9 @@ import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.BrowseBean;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.forms.Form;
import org.alfresco.web.forms.FormInstanceData;
+import org.alfresco.web.forms.FormNotFoundException;
import org.alfresco.web.forms.FormsService;
import org.alfresco.web.forms.Rendition;
import org.alfresco.web.ui.common.Utils;
@@ -724,7 +726,7 @@ public class SubmitDialog extends BaseDialogBean
for (AVMNodeDescriptor node : selected)
{
- if (AVMWorkflowUtil.isInActiveWorkflow(this.avmBrowseBean.getStagingStore(), node))
+ if (AVMWorkflowUtil.isInActiveWorkflow(AVMUtil.getStoreName(node.getPath()), node))
{
this.warningItems.add(new ItemWrapper(node));
continue;
@@ -750,42 +752,61 @@ public class SubmitDialog extends BaseDialogBean
// item is a form (note: could be deleted) or a rendition
FormInstanceData fid = null;
- if (isRendition)
+ try
{
- // found a generated rendition asset - locate the parent form instance data file
- // and use this to find all generated assets that are appropriate
- // NOTE: this path value is store relative
- fid = getFormsService().getRendition(ref).getPrimaryFormInstanceData(true);
+ if (isRendition)
+ {
+ // found a generated rendition asset - locate the parent form instance data file
+ // and use this to find all generated assets that are appropriate
+ // NOTE: this path value is store relative
+ fid = getFormsService().getRendition(ref).getPrimaryFormInstanceData(true);
+ }
+ else
+ {
+ fid = getFormsService().getFormInstanceData(ref);
+ }
}
- else
+ catch (FormNotFoundException fnfe)
{
- fid = getFormsService().getFormInstanceData(ref);
+ logger.warn(fnfe);
}
- // add the form instance data file to the list for submission
- if (!submittedPaths.contains(fid.getPath()))
+ if (fid != null)
{
- this.submitItems.add(new ItemWrapper(getAvmService().lookup(-1, fid.getPath(), true)));
- submittedPaths.add(fid.getPath());
- }
-
- // locate renditions for this form instance data file and add to list for submission
- for (final Rendition rendition : fid.getRenditions(true))
- {
- final String renditionPath = rendition.getPath();
- if (!submittedPaths.contains(renditionPath))
- {
- this.submitItems.add(new ItemWrapper(getAvmService().lookup(-1, renditionPath, true)));
- submittedPaths.add(renditionPath);
- }
- }
-
- // lookup the workflow defaults for that form and store into the list of available workflows
- WorkflowDefinition defaultWfDef = fid.getForm().getDefaultWorkflow();
- if (defaultWfDef != null)
- {
- this.workflows.add(new FormWorkflowWrapper(defaultWfDef.getName(),
- fid.getForm().getDefaultWorkflowParameters()));
+ // add the form instance data file to the list for submission
+ if (!submittedPaths.contains(fid.getPath()))
+ {
+ this.submitItems.add(new ItemWrapper(getAvmService().lookup(-1, fid.getPath(), true)));
+ submittedPaths.add(fid.getPath());
+ }
+
+ // locate renditions for this form instance data file and add to list for submission
+ for (final Rendition rendition : fid.getRenditions(true))
+ {
+ final String renditionPath = rendition.getPath();
+ if (!submittedPaths.contains(renditionPath))
+ {
+ this.submitItems.add(new ItemWrapper(getAvmService().lookup(-1, renditionPath, true)));
+ submittedPaths.add(renditionPath);
+ }
+ }
+
+ // lookup the workflow defaults for that form and store into the list of available workflows
+ Form f = null;
+ try
+ {
+ f = fid.getForm();
+ WorkflowDefinition defaultWfDef = f.getDefaultWorkflow();
+ if (defaultWfDef != null)
+ {
+ this.workflows.add(new FormWorkflowWrapper(defaultWfDef.getName(),
+ fid.getForm().getDefaultWorkflowParameters()));
+ }
+ }
+ catch (FormNotFoundException fnfe)
+ {
+ logger.warn(fnfe);
+ }
}
// See WCM-1090 ACT-1551
diff --git a/source/java/org/alfresco/web/forms/FormInstanceData.java b/source/java/org/alfresco/web/forms/FormInstanceData.java
index 935fcb369a..f862731c4d 100644
--- a/source/java/org/alfresco/web/forms/FormInstanceData.java
+++ b/source/java/org/alfresco/web/forms/FormInstanceData.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.List;
+import org.alfresco.service.cmr.avm.locking.AVMLock;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -45,25 +46,30 @@ public interface FormInstanceData
private final String path;
private final Rendition r;
private final Exception e;
+ private final AVMLock lock; // existing lock otherwise null
public RegenerateResult(final RenderingEngineTemplate ret,
- final String path,
- final Rendition r)
+ final String path,
+ final Rendition r,
+ final AVMLock lock)
{
this.ret = ret;
this.r = r;
this.e = null;
this.path = path;
+ this.lock = lock;
}
-
+
public RegenerateResult(final RenderingEngineTemplate ret,
final String path,
- final Exception e)
+ final Exception e,
+ final AVMLock lock)
{
this.ret = ret;
this.e = e;
this.r = null;
this.path = path;
+ this.lock = lock;
}
public RenderingEngineTemplate getRenderingEngineTemplate()
@@ -85,6 +91,11 @@ public interface FormInstanceData
{
return this.e;
}
+
+ public AVMLock getExistingLock()
+ {
+ return this.lock;
+ }
}
/////////////////////////////////////////////////////////////////////////////
diff --git a/source/java/org/alfresco/web/forms/FormInstanceDataImpl.java b/source/java/org/alfresco/web/forms/FormInstanceDataImpl.java
index fd2b6bdd89..99b1ac5621 100644
--- a/source/java/org/alfresco/web/forms/FormInstanceDataImpl.java
+++ b/source/java/org/alfresco/web/forms/FormInstanceDataImpl.java
@@ -40,9 +40,11 @@ import org.alfresco.service.cmr.avm.locking.AVMLockingService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.web.app.Application;
import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.wcm.AVMUtil;
+import org.alfresco.web.bean.wcm.WebProject;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
@@ -60,11 +62,22 @@ import org.xml.sax.SAXException;
private static final Log logger = LogFactory.getLog(RenditionImpl.class);
private final NodeRef nodeRef;
+ private final WebProject webProject;
+
private transient FormsService formsService;
/* package */ FormInstanceDataImpl(final NodeRef nodeRef,
final FormsService formsService)
{
+ this(nodeRef, formsService, null);
+ }
+
+ /* package */ FormInstanceDataImpl(final NodeRef nodeRef,
+ final FormsService formsService,
+ final WebProject webProject)
+ {
+ this.webProject = webProject;
+
if (nodeRef == null)
{
throw new NullPointerException();
@@ -152,6 +165,10 @@ import org.xml.sax.SAXException;
}
catch (FormNotFoundException fnfe)
{
+ if (webProject != null)
+ {
+ throw new FormNotFoundException(parentFormName, webProject, this);
+ }
throw new FormNotFoundException(parentFormName, this);
}
}
@@ -189,7 +206,6 @@ import org.xml.sax.SAXException;
new HashSet(this.getForm().getRenderingEngineTemplates());
final List result = new LinkedList();
// regenerate existing renditions
- boolean renditionLockedBefore = false;
String path = null;
for (final Rendition r : this.getRenditions())
@@ -207,13 +223,15 @@ import org.xml.sax.SAXException;
continue;
}
}
-
}
+
final RenderingEngineTemplate ret = r.getRenderingEngineTemplate();
if (ret == null || !allRets.contains(ret))
{
continue;
}
+
+ AVMLock lock = null;
try
{
if (logger.isDebugEnabled())
@@ -221,13 +239,10 @@ import org.xml.sax.SAXException;
logger.debug("regenerating rendition " + r + " using template " + ret);
}
- renditionLockedBefore = false;
path = r.getPath();
- AVMLock lock = avmLockService.getLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
+ lock = avmLockService.getLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
if (lock != null)
{
- renditionLockedBefore = true;
-
if (logger.isDebugEnabled())
{
logger.debug("Lock already exists for " + path);
@@ -236,14 +251,14 @@ import org.xml.sax.SAXException;
ret.render(this, r);
allRets.remove(ret);
- result.add(new RegenerateResult(ret, path, r));
+ result.add(new RegenerateResult(ret, path, r, lock));
}
catch (Exception e)
{
- result.add(new RegenerateResult(ret, path, e));
+ result.add(new RegenerateResult(ret, path, e, lock));
// remove lock if there wasn't one before
- if (renditionLockedBefore == false)
+ if (lock == null)
{
avmLockService.removeLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
@@ -255,47 +270,84 @@ import org.xml.sax.SAXException;
}
}
+ // get current username for lock checks
+ String username = Application.getCurrentUser(FacesContext.getCurrentInstance()).getUserName();
+
// render all renditions for newly added templates
for (final RenderingEngineTemplate ret : allRets)
{
+ AVMLock lock = null;
+ boolean lockModified = false;
+
try
{
- renditionLockedBefore = false;
- path = ret.getOutputPathForRendition(this, originalParentAvmPath, getName());
-
+ path = ret.getOutputPathForRendition(this, originalParentAvmPath, getName().replaceAll("(.+)\\..*", "$1"));
+
if (logger.isDebugEnabled())
{
logger.debug("regenerating rendition of " + this.getPath() +
" at " + path + " using template " + ret);
}
- AVMLock lock = avmLockService.getLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
+ String storeId = AVMUtil.getStoreId(path);
+ String storePath = AVMUtil.getStoreRelativePath(path);
+ String storeName = AVMUtil.getStoreName(path);
+
+ lock = avmLockService.getLock(storeId, storePath);
+
if (lock != null)
{
- renditionLockedBefore = true;
-
if (logger.isDebugEnabled())
{
logger.debug("Lock already exists for " + path);
}
+
+ if (lock.getStore().equals(storeName) == false)
+ {
+ if (lock.getOwners().contains(username))
+ {
+ lockModified = true;
+
+ // lock already exists on path, check it's owned by the current user
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("transferring lock from " + lock.getStore() + " to " + storeName + " for path: " + path);
+ }
+
+ avmLockService.modifyLock(storeId, storePath, null, storeName, null, null);
+ }
+ }
}
- result.add(new RegenerateResult(ret, path, ret.render(this, path)));
+ result.add(new RegenerateResult(ret, path, ret.render(this, path), lock));
}
catch (Exception e)
{
- result.add(new RegenerateResult(ret, path, e));
+ result.add(new RegenerateResult(ret, path, e, lock));
- // remove lock if there wasn't one before
- if (renditionLockedBefore == false)
+ String storeId = AVMUtil.getStoreId(path);
+ String storePath = AVMUtil.getStoreRelativePath(path);
+ String storeName = AVMUtil.getStoreName(path);
+
+ if (lock == null)
{
- avmLockService.removeLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
+ // remove lock if there wasn't one before
+ avmLockService.removeLock(storeId, storePath);
if (logger.isDebugEnabled())
{
logger.debug("Removed lock for " + path + " as it failed to generate");
}
}
+ else if (lockModified)
+ {
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("transferring lock from " + storeName + " to " + lock.getStore() + " for path: " + path);
+ }
+
+ avmLockService.modifyLock(storeId, storePath, null, lock.getStore(), null, null);
+ }
}
}
return result;
diff --git a/source/java/org/alfresco/web/forms/FormsService.java b/source/java/org/alfresco/web/forms/FormsService.java
index a9850d1b93..bdf54752f3 100644
--- a/source/java/org/alfresco/web/forms/FormsService.java
+++ b/source/java/org/alfresco/web/forms/FormsService.java
@@ -30,6 +30,7 @@ import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.policy.Behaviour;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -290,32 +291,27 @@ public final class FormsService
return result;
}
- public FormInstanceData getFormInstanceData(final int version, final String avmPath)
+ public FormInstanceData getFormInstanceData(final int version, final String avmPath) throws FormNotFoundException
{
return this.getFormInstanceData(AVMNodeConverter.ToNodeRef(version, avmPath));
}
- public FormInstanceData getFormInstanceData(final NodeRef nodeRef)
+ public FormInstanceData getFormInstanceData(final NodeRef nodeRef) throws FormNotFoundException
{
final String avmPath = AVMNodeConverter.ToAVMVersionPath(nodeRef).getSecond();
final WebProject webProject = new WebProject(avmPath);
- return new FormInstanceDataImpl(nodeRef, this)
+
+ FormInstanceData fid = null;
+ try
{
- @Override
- public Form getForm()
- throws FormNotFoundException
- {
- final Form f = super.getForm();
- try
- {
- return webProject.getForm(f.getName());
- }
- catch (FormNotFoundException fnfne)
- {
- throw new FormNotFoundException(f, webProject, this);
- }
- }
- };
+ fid = new FormInstanceDataImpl(nodeRef, this, webProject);
+ return fid;
+ }
+ catch (IllegalArgumentException iae)
+ {
+ // note: FormNotFoundException extends FileNotFoundException
+ throw new FormNotFoundException(iae.getMessage());
+ }
}
public Rendition getRendition(final int version, final String avmPath)
diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 3056a7326e..0d2e46eb88 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -36,8 +36,11 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.regex.Pattern;
+import javax.faces.context.FacesContext;
+
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.util.Pair;
+import org.alfresco.web.app.Application;
import org.alfresco.web.forms.XMLUtil;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
@@ -1930,7 +1933,7 @@ public class Schema2XForms implements Serializable
// add xforms:repeat section if this element re-occurs
if ((o.isOptional() && (controlType instanceof XSSimpleTypeDefinition || "anyType".equals(controlType.getName()))) ||
- (o.maximum == 1 && o.minimum == 1))
+ (o.maximum == 1 && o.minimum == 1) || (controlType instanceof XSComplexTypeDefinition && pathToRoot.equals("")))
{
return formSection;
}
@@ -2804,6 +2807,9 @@ public class Schema2XForms implements Serializable
final Map enumValues =
new LinkedHashMap(enumFacets.getLength());
+
+ final String nullValue = Application.getMessage(FacesContext.getCurrentInstance(), "please_select");
+ enumValues.put(nullValue, null);
for (int i = 0; i < enumFacets.getLength(); i++)
{
enumValues.put(enumFacets.item(i),
@@ -2824,29 +2830,6 @@ public class Schema2XForms implements Serializable
NamespaceConstants.XFORMS_PREFIX + ":appearance",
appearance);
- // add the "Please select..." instruction item for the combobox
- // and set the isValid attribute on the bind element to check for the "Please select..."
- // item to indicate that is not a valid value
- final String pleaseSelect = "[Select1 " + caption + "]";
- final Element item = this.createXFormsItem(xformsDocument, pleaseSelect, pleaseSelect);
- choices.appendChild(item);
-
- // not(purchaseOrder/state = '[Choose State]')
- //String isValidExpr = "not(" + bindElement.getAttributeNS(NamespaceConstants.XFORMS_NS,"nodeset") + " = '" + pleaseSelect + "')";
- // ->no, not(. = '[Choose State]')
- final String isValidExpr = "not( . = '" + pleaseSelect + "')";
-
- //check if there was a constraint
- String constraint = bindElement.getAttributeNS(NamespaceConstants.XFORMS_NS, "constraint");
-
- constraint = (constraint != null && constraint.length() != 0
- ? constraint + " and " + isValidExpr
- : isValidExpr);
-
- bindElement.setAttributeNS(NamespaceConstants.XFORMS_NS,
- NamespaceConstants.XFORMS_PREFIX + ":constraint",
- constraint);
-
control.appendChild(choices);
this.addChoicesForSelectControl(xformsDocument, choices, enumValues, resourceBundle);
return control;
@@ -3026,7 +3009,12 @@ public class Schema2XForms implements Serializable
for (int i = 0; lexicalPatterns != null && i < lexicalPatterns.getLength()
&& !SchemaSymbols.ATTVAL_INTEGER.equals(typeName); i++)
{
- constraints.add("chiba:match(., '" + lexicalPatterns.item(i) + "',null)");
+ String pattern = lexicalPatterns.item(i);
+ if (o.isOptional())
+ {
+ pattern= "(" + pattern + ")?";
+ }
+ constraints.add("chiba:match(., '" + pattern + "',null)");
}
}
diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
index 7c1be5423f..6625b4e2c6 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
@@ -211,7 +211,9 @@ public class PageTag extends TagSupport
out.write("\n");
}
- out.write("");
+ out.write("<html><head>");
+ out.write("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\" />\n");
+ out.write("<title>");
if (this.titleId != null && this.titleId.length() != 0)
{
out.write(Utils.encode(Application.getMessage(pageContext.getSession(), this.titleId)));
@@ -228,7 +230,6 @@ public class PageTag extends TagSupport
out.write("<link rel=\"search\" type=\"application/opensearchdescription+xml\" href=\"" + reqPath +
"/wcservice/api/search/keyword/description.xml\" title=\"Alfresco Keyword Search\">\n");
out.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n");
- out.write("<meta http-equiv=\"X-UA-Compatible\" content=\"Edge\" />\n");
}
// CSS style includes
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 396f888143..12ae1c2b61 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -645,6 +645,10 @@
<property-name>contentUsageService</property-name>
<value>#{ContentUsageService}</value>
</managed-property>
+ <managed-property>
+ <property-name>userRegistrySynchronizer</property-name>
+ <value>#{userRegistrySynchronizer}</value>
+ </managed-property>
</managed-bean>
<managed-bean>
diff --git a/source/web/jsp/users/edit-user-details.jsp b/source/web/jsp/users/edit-user-details.jsp
index 3ade1b70e1..b217679963 100644
--- a/source/web/jsp/users/edit-user-details.jsp
+++ b/source/web/jsp/users/edit-user-details.jsp
@@ -57,31 +57,31 @@ function updateButtonState()
<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%" columnClasses=",alignTop,">
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.first_name}:"/>
- <h:inputText id="first-name" value="#{DialogManager.bean.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+ <h:inputText id="first-name" value="#{DialogManager.bean.firstName}" disabled="#{UsersBeanProperties.immutability.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.last_name}:"/>
- <h:inputText id="last-name" value="#{DialogManager.bean.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+ <h:inputText id="last-name" value="#{DialogManager.bean.lastName}" disabled="#{UsersBeanProperties.immutability.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.email}"/>
- <h:inputText id="email" value="#{DialogManager.bean.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+ <h:inputText id="email" value="#{DialogManager.bean.email}" disabled="#{UsersBeanProperties.immutability.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
<f:verbatim/>
<h:outputText value="#{msg.user_organization}:"/>
- <h:inputText id="organisation" value="#{DialogManager.bean.personProperties.organization}" size="35" maxlength="1024" />
+ <h:inputText id="organisation" value="#{DialogManager.bean.personProperties.organization}" disabled="#{UsersBeanProperties.immutability.organization}" size="35" maxlength="1024" />
<f:verbatim/>
<h:outputText value="#{msg.user_jobtitle}:"/>
- <h:inputText id="jobtitle" value="#{DialogManager.bean.personProperties.jobtitle}" size="35" maxlength="1024" />
+ <h:inputText id="jobtitle" value="#{DialogManager.bean.personProperties.jobtitle}" disabled="#{UsersBeanProperties.immutability.jobtitle}" size="35" maxlength="1024" />
<f:verbatim/>
<h:outputText value="#{msg.user_location}:"/>
- <h:inputText id="location" value="#{DialogManager.bean.personProperties.location}" size="35" maxlength="1024" />
+ <h:inputText id="location" value="#{DialogManager.bean.personProperties.location}" disabled="#{UsersBeanProperties.immutability.location}" size="35" maxlength="1024" />
<f:verbatim/>
<h:outputText value="#{msg.presence_provider}:"/>
- <h:selectOneMenu value="#{DialogManager.bean.personProperties.presenceProvider}">
+ <h:selectOneMenu value="#{DialogManager.bean.personProperties.presenceProvider}" disabled="#{UsersBeanProperties.immutability.presenceProvider}">
<f:selectItem itemValue="" itemLabel="(#{msg.none})"/>
<f:selectItem itemValue="skype" itemLabel="Skype"/>
<f:selectItem itemValue="yahoo" itemLabel="Yahoo"/>
@@ -89,11 +89,11 @@ function updateButtonState()
<f:verbatim/>
<h:outputText value="#{msg.presence_username}:"/>
- <h:inputText value="#{DialogManager.bean.personProperties.presenceUsername}" size="35" maxlength="256" />
+ <h:inputText value="#{DialogManager.bean.personProperties.presenceUsername}" disabled="#{UsersBeanProperties.immutability.presenceUsername}" size="35" maxlength="256" />
<f:verbatim/>
<h:outputText value="#{msg.user_description}:"/>
- <h:inputTextarea id="biography" value="#{DialogManager.bean.personDescription}" rows="6" cols="60" />
+ <h:inputTextarea id="biography" value="#{DialogManager.bean.personDescription}" disabled="#{UsersBeanProperties.immutability.personDescription}" rows="6" cols="60" />
<f:verbatim/>
<h:outputText value="#{msg.user_avatar}:"/>
diff --git a/source/web/jsp/users/new-user-wizard/person-properties.jsp b/source/web/jsp/users/new-user-wizard/person-properties.jsp
index b286926c8c..a644692759 100644
--- a/source/web/jsp/users/new-user-wizard/person-properties.jsp
+++ b/source/web/jsp/users/new-user-wizard/person-properties.jsp
@@ -53,15 +53,15 @@
<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%">
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.first_name}:"/>
- <h:inputText id="firstName" value="#{WizardManager.bean.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+ <h:inputText id="firstName" value="#{WizardManager.bean.firstName}" disabled="#{WizardManager.bean.personPropertiesImmutability.firstName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.last_name}:"/>
- <h:inputText id="lastName" value="#{WizardManager.bean.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+ <h:inputText id="lastName" value="#{WizardManager.bean.lastName}" disabled="#{WizardManager.bean.personPropertiesImmutability.lastName}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
<h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
<h:outputText value="#{msg.email}"/>
- <h:inputText id="email" value="#{WizardManager.bean.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+ <h:inputText id="email" value="#{WizardManager.bean.email}" disabled="#{WizardManager.bean.personPropertiesImmutability.email}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
</h:panelGrid>
<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
@@ -74,23 +74,23 @@
<h:inputText value="#{WizardManager.bean.companyId}" size="35" maxlength="1024" />
<h:outputText value="#{msg.user_organization}:"/>
- <h:inputText id="organisation" value="#{WizardManager.bean.organization}" size="35" maxlength="1024" />
+ <h:inputText id="organisation" value="#{WizardManager.bean.organization}" disabled="#{WizardManager.bean.personPropertiesImmutability.organization}" size="35" maxlength="1024" />
<h:outputText value="#{msg.user_jobtitle}:"/>
- <h:inputText id="jobtitle" value="#{WizardManager.bean.jobtitle}" size="35" maxlength="1024" />
+ <h:inputText id="jobtitle" value="#{WizardManager.bean.jobtitle}" disabled="#{WizardManager.bean.personPropertiesImmutability.jobtitle}" size="35" maxlength="1024" />
<h:outputText value="#{msg.user_location}:"/>
- <h:inputText id="location" value="#{WizardManager.bean.location}" size="35" maxlength="1024" />
+ <h:inputText id="location" value="#{WizardManager.bean.location}" disabled="#{WizardManager.bean.personPropertiesImmutability.location}" size="35" maxlength="1024" />
- <h:outputText value="#{msg.presence_provider}:"/>
- <h:selectOneMenu value="#{WizardManager.bean.presenceProvider}">
+ <h:outputText value="#{msg.presence_provider}:" />
+ <h:selectOneMenu value="#{WizardManager.bean.presenceProvider}" disabled="#{WizardManager.bean.personPropertiesImmutability.presenceProvider}">
<f:selectItem itemValue="" itemLabel="(#{msg.none})"/>
<f:selectItem itemValue="skype" itemLabel="Skype"/>
<f:selectItem itemValue="yahoo" itemLabel="Yahoo"/>
</h:selectOneMenu>
<h:outputText value="#{msg.presence_username}:"/>
- <h:inputText value="#{WizardManager.bean.presenceUsername}" size="35" maxlength="256" />
+ <h:inputText value="#{WizardManager.bean.presenceUsername}" disabled="#{WizardManager.bean.personPropertiesImmutability.presenceUsername}" size="35" maxlength="256" />
<h:outputText value="#{msg.sizeQuota}:" rendered="#{UsersBeanProperties.usagesEnabled == true}"/>
<h:panelGroup>
diff --git a/source/web/jsp/users/user-console.jsp b/source/web/jsp/users/user-console.jsp
index 16969fdb17..6f27f81ef5 100644
--- a/source/web/jsp/users/user-console.jsp
+++ b/source/web/jsp/users/user-console.jsp
@@ -95,7 +95,7 @@
<a:actionLink id="change-password" value="#{msg.change_password}"
action="dialog:changeMyPassword"
image="/images/icons/change_password.gif"
- rendered="#{!NavigationBean.isGuest && NavigationBean.allowUserConfig}" />
+ rendered="#{!NavigationBean.isGuest && NavigationBean.allowUserConfig && NavigationBean.allowUserChangePassword}" />
</a:panel>
</h:panelGroup>
diff --git a/source/web/jsp/users/users.jsp b/source/web/jsp/users/users.jsp
index c9b4ed7b37..5e45311eb9 100644
--- a/source/web/jsp/users/users.jsp
+++ b/source/web/jsp/users/users.jsp
@@ -132,7 +132,7 @@
<f:facet name="header">
<h:outputText value="#{msg.actions}" />
</f:facet>
- <a:actionLink rendered="#{r.isMutable}" value="#{msg.modify}" image="/images/icons/edituser.gif" showLink="false" action="wizard:editUser" actionListener="#{DialogManager.bean.setupUserAction}">
+ <a:actionLink value="#{msg.modify}" image="/images/icons/edituser.gif" showLink="false" action="wizard:editUser" actionListener="#{DialogManager.bean.setupUserAction}">
<f:param name="id" value="#{r.id}" />
</a:actionLink>
<a:actionLink rendered="#{r.isMutable}" value="#{msg.change_password}" image="/images/icons/change_password.gif" showLink="false" action="dialog:changePassword" actionListener="#{DialogManager.bean.setupUserAction}">
diff --git a/source/web/scripts/ajax/common.js b/source/web/scripts/ajax/common.js
index 78ef33fc56..6ec218da05 100644
--- a/source/web/scripts/ajax/common.js
+++ b/source/web/scripts/ajax/common.js
@@ -4,6 +4,34 @@
//
+function getIEEngine()
+{
+ var engine = null;
+
+ if (document.documentMode) // IE8
+ engine = document.documentMode;
+ else // IE 5-7
+ {
+ engine = 5; // Assume quirks mode unless proven otherwise
+ if (document.compatMode)
+ {
+ if (document.compatMode == "CSS1Compat")
+ engine = 7; // standards mode
+ }
+ }
+ return engine;
+
+}
+
+function getIEVersion()
+{
+ var rv = -1;
+ var ua = window.navigator.userAgent;
+ var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
+ if (re.exec(ua) != null) rv = parseFloat(RegExp.$1);
+ return rv;
+}
+
// Global Alfresco namespace object
if (typeof Alfresco == "undefined")
{
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index 21fbd916d9..88f54890a1 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -31,6 +31,9 @@
// Initiliaze dojo requirements, tinymce, and add a hook to load the xform.
////////////////////////////////////////////////////////////////////////////////
+alfresco.ieVersion = getIEVersion();
+alfresco.ieEngine = alfresco.ieVersion == -1 ? -1 : getIEEngine();
+
djConfig.parseWidgets = false;
dojo.require("dojo.lfx.html");
alfresco.log = alfresco.constants.DEBUG ? log : Class.empty;
@@ -682,8 +685,8 @@ alfresco.xforms.TextField = alfresco.xforms.Widget.extend({
if (this.isReadonly())
{
- this.widget.setAttribute("readonly", this.isReadonly());
- this.widget.setAttribute("disabled", this.isReadonly());
+ this.widget.setAttribute("readonly", true);
+ this.widget.setAttribute("disabled", true);
}
else
{
@@ -835,12 +838,13 @@ alfresco.xforms.PlainTextEditor = alfresco.xforms.Widget.extend({
this.widget.appendChild(document.createTextNode(initialValue));
if (this.isReadonly())
{
- this.widget.setAttribute("readonly", this.isReadonly());
+ this.widget.setAttribute("readonly", true);
}
var borderWidth = (this.widget.offsetWidth - this.widget.clientWidth);
var marginRight = 2;
this.widget.style.marginRight = marginRight + "px";
- this.widget.style.width = (((attach_point.offsetWidth - borderWidth - marginRight) / attach_point.offsetWidth) * 100) + "%";
+ var ow = attach_point.offsetWidth;
+ this.widget.style.width = (((ow - borderWidth - marginRight) / ow) * 100) + "%";
this.widget.onchange =this._textarea_changeHandler.bindAsEventListener(this);
},
@@ -2782,7 +2786,10 @@ alfresco.xforms.VGroup = alfresco.xforms.AbstractGroup.extend({
child.domContainer);
}
- var contentDiv = new Element("div", { "id": child.id + "-content", "class": "xformsGroupItem"});
+ var contentDiv = new Element("div", { "id": child.id + "-content", "class": "xformsGroupItem",
+ "styles": {"left": (child instanceof alfresco.xforms.AbstractGroup
+ ? "0px"
+ : "30%")}});
this._contentDivs[child.id] = contentDiv;
if (!(child instanceof alfresco.xforms.AbstractGroup))
{
@@ -2791,36 +2798,40 @@ alfresco.xforms.VGroup = alfresco.xforms.AbstractGroup.extend({
}
child.domContainer.appendChild(contentDiv);
- contentDiv.style.left = (child instanceof alfresco.xforms.AbstractGroup
- ? "0px"
- : "30%");
var contentDivWidth = "100%";
// the following does avoid devision by zero ... in contentDiv.offsetLeft / child.domContainer.offsetWidth
- if (!(child instanceof alfresco.xforms.AbstractGroup) && child.domContainer.offsetWidth != 0)
+ var ow = child.domContainer.offsetWidth;
+ if (!(child instanceof alfresco.xforms.AbstractGroup) && ow != 0)
{
- contentDivWidth = ((1 - (contentDiv.offsetLeft / child.domContainer.offsetWidth)) * 100) + "%";
+ contentDivWidth = ((1 - (contentDiv.offsetLeft / ow)) * 100) + "%";
}
contentDiv.style.width = contentDivWidth;
child.render(contentDiv);
+
+ var oh = contentDiv.offsetHeight;
+ var mt = contentDiv.getStyle("margin-top").toInt();
if (!(child instanceof alfresco.xforms.AbstractGroup))
{
child.domContainer.style.height =
- Math.max(contentDiv.offsetHeight +
- contentDiv.getStyle("margin-top").toInt() +
+ Math.max(oh +
+ mt +
contentDiv.getStyle("margin-bottom").toInt(),
20) + "px";
}
- alfresco.log(contentDiv.getAttribute("id") + " offsetTop is " + contentDiv.offsetTop);
- contentDiv.style.top = "-" + Math.max(0, contentDiv.offsetTop - contentDiv.getStyle("margin-top").toInt()) + "px";
+ var ot = contentDiv.offsetTop;
+ alfresco.log(contentDiv.getAttribute("id") + " offsetTop is " + ot);
+ var top = Math.max(0, ot - mt);
+ contentDiv.style.top = "-" + top + "px";
+
if (contentDiv.labelNode)
{
// contentDiv.labelNode.style.top = (contentDiv.offsetTop + ((.5 * contentDiv.offsetHeight) -
// (.5 * contentDiv.labelNode.offsetHeight))) + "px";
contentDiv.labelNode.style.position = "relative";
- contentDiv.labelNode.style.top = contentDiv.offsetTop + "px";
- contentDiv.labelNode.style.height = contentDiv.offsetHeight + "px";
+ contentDiv.labelNode.style.top = "0px";
+ contentDiv.labelNode.style.height = oh + "px";
contentDiv.labelNode.style.lineHeight = contentDiv.labelNode.style.height;
}
@@ -2939,18 +2950,19 @@ alfresco.xforms.VGroup = alfresco.xforms.AbstractGroup.extend({
contentDiv.style.position = "static";
contentDiv.style.top = "0px";
- contentDiv.style.left = "0px";
+// contentDiv.style.left = "0px";
contentDiv.style.position = "relative";
contentDiv.style.left = (this._children[i] instanceof alfresco.xforms.AbstractGroup
? "0px"
: "30%");
- if (this._children[i].domContainer.parentNode.offsetWidth != 0)
+ parentOffsetWidth = this._children[i].domContainer.parentNode.offsetWidth;
+ if (parentOffsetWidth != 0)
{
contentDiv.style.width = (this._children[i] instanceof alfresco.xforms.AbstractGroup
? "100%"
: (1 - (contentDiv.offsetLeft /
- this._children[i].domContainer.parentNode.offsetWidth)) * 100 + "%");
+ parentOffsetWidth)) * 100 + "%");
}
else
{
@@ -2964,26 +2976,17 @@ alfresco.xforms.VGroup = alfresco.xforms.AbstractGroup.extend({
if (!(this._children[i] instanceof alfresco.xforms.AbstractGroup))
{
+ var contentDivMarginTop = contentDiv.getStyle("margin-top").toInt();
this._children[i].domContainer.style.height =
Math.max(contentDiv.offsetHeight +
- contentDiv.getStyle("margin-top").toInt() +
+ contentDivMarginTop +
contentDiv.getStyle("margin-bottom").toInt(),
20) + "px";
}
- contentDiv.style.top = "-" + Math.max(0, contentDiv.offsetTop - contentDiv.getStyle("margin-top").toInt()) + "px";
+ contentDiv.style.top = "-" + Math.max(0, contentDiv.offsetTop -
+ (contentDivMarginTop == undefined ? contentDiv.getStyle("margin-top").toInt() : contentDivMarginTop)) + "px";
- var labelNode = contentDiv.labelNode;
- if (labelNode)
- {
-// labelNode.style.position = "static";
-// labelNode.style.top = "0px";
-// labelNode.style.left = "0px";
-// labelNode.style.position = "relative";
-
-// labelNode.style.top = (contentDiv.offsetTop + ((.5 * contentDiv.offsetHeight) -
-// (.5 * labelNode.offsetHeight))) + "px";
- }
}
},
@@ -3669,7 +3672,9 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({
_updateDisplay: function(recursively)
{
- this.parent(recursively);
+ var recurseOnChildren = alfresco.ieVersion != -1 && alfresco.ieEngine < 8;
+ this.parent(recursively && !recurseOnChildren);
+
if (this.getViewRoot().focusedRepeat != null &&
(this.getViewRoot().focusedRepeat == this ||
this.getViewRoot().focusedRepeat.isAncestorOf(this)))
@@ -3699,7 +3704,7 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({
this._repeatControls[i].style.backgroundColor = this._children[i].domContainer.getStyle("background-color");
- if (window.navigator.appName == "Microsoft Internet Explorer")
+ if (recurseOnChildren)
{
this._children[i]._updateDisplay(true);
}
@@ -4242,6 +4247,8 @@ alfresco.xforms.XForm = new Class({
{
if (xformsNode.childNodes[i].nodeType != document.ELEMENT_NODE)
{
+ if (alfresco.ieVersion == -1)
+ {
// fix for ETWOTWO-490, hide elements after rendering (Mozila/Firefox)
if ((i == (xformsNode.childNodes.length - 1)) &&
(parentWidget instanceof alfresco.xforms.SwitchGroup))
@@ -4254,6 +4261,7 @@ alfresco.xforms.XForm = new Class({
}
}
}
+ }
continue;
}
alfresco.log("loading " + xformsNode.childNodes[i].nodeName +