Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 5a8f6ee635
commit e60d57ea42
70 changed files with 7094 additions and 1988 deletions

View File

@@ -79,7 +79,7 @@
<f:facet name="header">
<a:sortLink id="col7-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
</f:facet>
<h:outputText id="col7-txt" value="#{r['bpm:priority']}" />
<h:outputText id="col7-txt" value="#{r['priorityMessage']}" />
</a:column>
<%-- Actions column --%>

View File

@@ -87,7 +87,7 @@
<f:facet name="header">
<a:sortLink id="col7-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
</f:facet>
<h:outputText id="col7-txt" value="#{r['bpm:priority']}" />
<h:outputText id="col7-txt" value="#{r['priorityMessage']}" />
</a:column>
<%-- Actions column --%>

View File

@@ -74,12 +74,12 @@
<h:outputText id="col6-txt" value="#{r['bpm:status']}" />
</a:column>
<%-- Priority column --%>
<%-- Priority column --%>
<a:column id="col7" style="padding:2px;text-align:left">
<f:facet name="header">
<a:sortLink id="col7-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
</f:facet>
<h:outputText id="col7-txt" value="#{r['bpm:priority']}" />
<h:outputText id="col7-txt" value="#{r['priorityMessage']}" />
</a:column>
<%-- Actions column --%>