Merged 3.1 to HEAD

13841: Build fix
   13988: Applied patch for ETHREEOH-1620 (webdav issues with WebSphere)
   13993: Partial (UI portion) fix for ETHREEOH-1500: Remove visibility of Workflow items
   13995: Fix for ETHREEOH-1883: Start advanced workflow wizard lists the WCM 'Direct Submit to Staging' workflow as one of the selectable workflows
   14061: Fix for ETHREEOH-1891: Form repeat element not working in 3.1

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2009-04-23 14:07:20 +00:00
parent 30ce335c4c
commit 76dcb743a2
3 changed files with 28 additions and 9 deletions

View File

@@ -412,8 +412,14 @@ alfresco.xforms.Widget = new Class({
/** Returns the widget's label. */
getLabel: function()
{
var result = "";
var node = this._getChildXFormsNode("label");
var result = node ? node.firstChild.nodeValue : "";
if (node && node.firstChild !== null)
{
result = node.firstChild.nodeValue;
}
if (alfresco.constants.DEBUG)
{
result += " [" + this.id + "]";
@@ -1259,7 +1265,7 @@ alfresco.xforms.CheckboxSelect = alfresco.xforms.AbstractSelectWidget.extend({
{
this.parent(value, forceCommit);
this._selectedValues = value.split(' ');
var checkboxes = this.widgets.getElementsByTagName("input");
var checkboxes = this.widget.getElementsByTagName("input");
for (var i = 0; i < checkboxes.length; i++)
{
checkboxes[i].checked =
@@ -1341,7 +1347,7 @@ alfresco.xforms.ListSelect = alfresco.xforms.AbstractSelectWidget.extend({
{
this.parent(value, forceCommit);
this._selectedValues = value.split(' ');
var options = this.widgets.getElementsByTagName("option");
var options = this.widget.getElementsByTagName("option");
for (var i = 0; i < options.length; i++)
{
options[i].selected =