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.0 to HEAD

Browse Source 
5311: AWC-1147
   5314: AWC-1153


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-03-07 15:48:31 +00:00
parent 4c8b0a596d
commit d4b35182b2
4 changed files with 6 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
View File

@@ -650,26 +650,17 @@ public class CheckinCheckoutBean
MimetypeMap.MIMETYPE_TEXT_CSS.equals(mimetype) ||
MimetypeMap.MIMETYPE_JAVASCRIPT.equals(mimetype))
{
// make content available to the editing screen
// make content available to the text editing screen
setEditorOutput(reader.getContentString());
// navigate to appropriate screen
FacesContext fc = FacesContext.getCurrentInstance();
this.navigator.setupDispatchContext(node);
String outcome;
if (MimetypeMap.MIMETYPE_XML.equals(mimetype))
{
outcome = "dialog:editXmlInline";
}
else
{
outcome = "dialog:editTextInline";
}
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, outcome);
fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dialog:editTextInline");
}
else
{
// make content available to the editing screen
// make content available to the html editing screen
setDocumentContent(reader.getContentString());
setEditorOutput(null);

6
source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
View File

@@ -247,7 +247,7 @@ public class UITemplate extends SelfRenderingComponent
}
/**
* Return the custom data model to bind template against.
* Return the custom data model to bind template against. Not cached.
*
* @return Returns the custom data model to bind template against.
*/
@@ -258,14 +258,14 @@ public class UITemplate extends SelfRenderingComponent
ValueBinding vb = getValueBinding("model");
if (vb != null)
{
this.model = vb.getValue(getFacesContext());
return vb.getValue(getFacesContext());
}
}
return this.model;
}
/**
* @param model The model to set.
* @param model The model to set.
*/
public void setModel(Object model)
{