mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.0 to HEAD
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:
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user