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 V2.2 to HEAD

Browse Source 
8110: Fix for AWC-1664
  8112: Fix for AWC-1697

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-03-11 10:37:36 +00:00
parent b0d3cd68b6
commit 14043b0071
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
View File

@@ -135,7 +135,8 @@ public class CreateSpaceWizard extends BaseWizardBean
{ {
this.spaceType = this.getNodeService().getType(this.existingSpaceId).toString(); this.spaceType = this.getNodeService().getType(this.existingSpaceId).toString();
} }
else if (this.createFrom.equals(CREATEFROM_TEMPLATE) && this.templateSpaceId != null) else if (this.createFrom.equals(CREATEFROM_TEMPLATE) && this.templateSpaceId != null &&
!this.templateSpaceId.equals("none"))
{ {
NodeRef templateNode = new NodeRef(Repository.getStoreRef(), this.templateSpaceId); NodeRef templateNode = new NodeRef(Repository.getStoreRef(), this.templateSpaceId);
this.spaceType = this.getNodeService().getType(templateNode).toString(); this.spaceType = this.getNodeService().getType(templateNode).toString();

14
source/web/jsp/content/document-details.jsp
View File

@@ -304,8 +304,11 @@
<div style="padding: 4px"></div> <div style="padding: 4px"></div>
</f:verbatim> </f:verbatim>
<a:panel label="#{msg.version_history}" id="version-history-panel" progressive="true" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" rendered="#{DialogManager.bean.versionable}" <a:panel label="#{msg.version_history}" id="version-history-panel" progressive="true"
expanded='#{DialogManager.bean.panels["version-history-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}"> border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white"
rendered="#{DialogManager.bean.versionable && !NavigationBean.isGuest}"
expanded='#{DialogManager.bean.panels["version-history-panel"]}'
expandedActionListener="#{DialogManager.bean.expandPanel}">
<a:richList id="versionHistoryList" viewMode="details" value="#{DialogManager.bean.versionHistory}" var="r" styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%" <a:richList id="versionHistoryList" viewMode="details" value="#{DialogManager.bean.versionHistory}" var="r" styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
pageSize="10" initialSortColumn="versionDate" initialSortDescending="true"> pageSize="10" initialSortColumn="versionDate" initialSortDescending="true">
@@ -361,8 +364,11 @@
<a:dataPager styleClass="pager" id="pager-version-history" /> <a:dataPager styleClass="pager" id="pager-version-history" />
</a:richList> </a:richList>
</a:panel> </a:panel>
<a:panel label="#{msg.version_history}" id="no-version-history-panel" progressive="true" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" rendered="#{DialogManager.bean.versionable == false}" <a:panel label="#{msg.version_history}" id="no-version-history-panel" progressive="true" border="white"
expanded='#{DialogManager.bean.panels["version-history-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}"> bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white"
rendered="#{DialogManager.bean.versionable == false && !NavigationBean.isGuest}"
expanded='#{DialogManager.bean.panels["version-history-panel"]}'
expandedActionListener="#{DialogManager.bean.expandPanel}">
<h:outputText id="no-history-msg" value="#{msg.not_versioned}<br/><br/>" escape="false" /> <h:outputText id="no-history-msg" value="#{msg.not_versioned}<br/><br/>" escape="false" />
<r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write" id="eval_ver"> <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write" id="eval_ver">
<a:actionLink id="make-versionable" value="#{msg.allow_versioning}" action="#{DialogManager.bean.applyVersionable}" rendered="#{DialogManager.bean.locked == false}" /> <a:actionLink id="make-versionable" value="#{msg.allow_versioning}" action="#{DialogManager.bean.applyVersionable}" rendered="#{DialogManager.bean.locked == false}" />