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

Merged V3.2 to HEAD

Browse Source 
18207: Merged DEV/TEMPORARY to V3.2
      17887: ETHREEOH-3853: FF 3.0: Exception after double click on 'Add button'.
      18068: ETHREEOH-3623: Script Error on page "Web Form Details"
      18097: ETHREEOH-3826: System Error occurs on "More Actions" page for a Space after "Edit Details" page for the same Space has been previously opened
      18168: ETHREEOH-3789: Rule with simple workflow moves document to incorrect space
   18238: Fix for ETHREEOH-4000 - WebScript extensions readme.ftl template fixed.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2010-01-26 12:33:55 +00:00
parent 3f1fc77797
commit 482017a870
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
View File

@@ -1280,7 +1280,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
{
UISelectList selectList = (UISelectList)event.getComponent().findComponent(COMPONENT_FORMLIST);
int index = selectList.getRowIndex();
if (index != -1)
if (index != -1 && index < this.formsList.size())
{
Form form = (Form)this.formsList.get(index).getValue();
FormWrapper wrapper = new FormWrapper(form);
@@ -1437,9 +1437,12 @@ public class CreateWebsiteWizard extends BaseWizardBean
{
UISelectList selectList = (UISelectList)event.getComponent().findComponent(COMPONENT_WORKFLOWLIST);
int index = selectList.getRowIndex();
if (index != -1)
List<UIListItem> workflowsList = this.getWorkflowList();
if (index != -1 && index < workflowsList.size())
{
WorkflowDefinition workflow = (WorkflowDefinition)this.getWorkflowList().get(index).getValue();
WorkflowDefinition workflow = (WorkflowDefinition)workflowsList.get(index).getValue();
this.workflows.add(new WorkflowWrapper(
workflow.getName(), workflow.getTitle(), workflow.getDescription(), MATCH_DEFAULT));
}

12
source/web/jsp/content/edit-content-properties.jsp
View File

@@ -27,10 +27,16 @@
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
width="100%" rowClasses="wizardSectionHeading">
<f:verbatim>
<table cellpadding="2" width="100%" style="padding-top: 4px; padding-bottom: 4px;">
<tr class="wizardSectionHeading">
<td>
</f:verbatim>
<h:outputText value="&nbsp;#{msg.properties}" escape="false" />
</h:panelGrid>
<f:verbatim></td>
</tr>
</table>
</f:verbatim>
<r:propertySheetGrid id="content-props" value="#{DialogManager.bean.editableNode}"
var="editContentProps" columns="1" externalConfig="true" />

5
source/web/jsp/wcm/create-website-wizard/form-details.jsp
View File

@@ -24,6 +24,7 @@
--%>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
@@ -54,7 +55,7 @@
</script>
</f:verbatim>
<h:panelGrid columns="1" cellpadding="2" cellpadding="2" width="100%">
<h:panelGrid columns="1" cellpadding="2" cellspacing="2" width="100%">
<%-- Form properties --%>
<h:panelGroup>
<f:verbatim>
@@ -134,8 +135,6 @@
<h:outputText value="#{msg.output_path_pattern}:"/>
<f:verbatim>
</nobr>
</td>
<td>
</f:verbatim>
<h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="70" maxlength="1024" onchange="javascript:checkDisabledState();" onkeyup="javascript:checkDisabledState();" />
<h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />

3
source/web/jsp/wcm/create-website-wizard/form-templates.jsp
View File

@@ -24,6 +24,7 @@
--%>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
@@ -92,7 +93,7 @@
</script>
</f:verbatim>
<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellpadding="2" width="100%">
<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellspacing="2" width="100%">
<%-- Template selection list --%>
<h:outputText id="msg-select" styleClass="mainSubText" value="#{msg.website_select_templates}:" />
<h:panelGroup id="grp-0">