Merged V3.1 to HEAD

13418: ETHREEOH-1478 - Mimetype is incorrectly determined
   13419: Favourites list in Sites menu and My Sites dashlets could mismatch
   13421: ETHREEOH-1487 - Fix some UI text inconsistencies
   13434: ETHREEOH-1495 - Name / URL shortname etc needs to be space trimmed at beginning and end of input
   13478: ETHREEOH-1531 - "Adhoc Task" Workflow doesn't work (Oracle DB)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2009-03-12 12:38:17 +00:00
parent 9533d32662
commit e01d3dda4d
2 changed files with 3 additions and 3 deletions

View File

@@ -117,7 +117,7 @@
<div class="taskValue">
<select id="wrkType" style="width: 178px;">
<option value="review" selected>${message("office.workflow.review")}</option>
<option value="adhoc">${message("office.workflow.review")}</option>
<option value="adhoc">${message("office.workflow.adhoc")}</option>
</select>
</div>
<div class="taskParam">${message("office.property.assign_to")}:</div>

View File

@@ -45,8 +45,8 @@
[
<#list task.transitions as transition>
{
"id": "${transition.id}",
"label": "${transition.label}"
"id": "${transition.id!""}",
"label": "${transition.label!""}"
}<#if transition_has_next>,</#if>
</#list>
]