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

Merge V3.2 to HEAD

Browse Source 
16684: Fixed ETHREEOH-2348 "Wrong WebProject description display"
      - Description limited to 1000 chars 
      - The new values for name & description get displayed directly after update


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2009-10-14 12:56:20 +00:00
parent 9af5ac9f79
commit fdc7ae1fe5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java
View File

@@ -139,6 +139,9 @@ public class EditWebsiteWizard extends CreateWebsiteWizard
// to the model for this web project // to the model for this web project
saveWebProjectModel(nodeRef); saveWebProjectModel(nodeRef);
// Make sure name and description are refreshed before display
this.navigator.resetCurrentNodeProperties();
return AlfrescoNavigationHandler.CLOSE_WIZARD_OUTCOME; return AlfrescoNavigationHandler.CLOSE_WIZARD_OUTCOME;
} }

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

@@ -48,13 +48,16 @@
function checkButtonState() function checkButtonState()
{ {
if (document.getElementById("wizard:wizard-body:name").value.length == 0 || if (document.getElementById("wizard:wizard-body:name").value.length == 0 ||
document.getElementById("wizard:wizard-body:dnsname").value.length < 1) document.getElementById("wizard:wizard-body:dnsname").value.length < 1 ||
document.getElementById("wizard:wizard-body:description").value.length > 1000)
{ {
document.getElementById("wizard:next-button").disabled = true; document.getElementById("wizard:next-button").disabled = true;
document.getElementById("wizard:finish-button").disabled = true;
} }
else else
{ {
document.getElementById("wizard:next-button").disabled = false; document.getElementById("wizard:next-button").disabled = false;
document.getElementById("wizard:finish-button").disabled = false;
} }
} }
@@ -171,7 +174,8 @@
</td> </td>
<td> <td>
</f:verbatim> </f:verbatim>
<h:inputTextarea id="description" value="#{WizardManager.bean.description}" rows="3" cols="42" /> <h:inputTextarea id="description" value="#{WizardManager.bean.description}" rows="3" cols="42"
onkeyup="javascript:checkButtonState();" />
<f:verbatim> <f:verbatim>
</td> </td>
</tr> </tr>