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

Browse Source 
6466: Xml metadata.  Support for pulling collections of values from XML
   6470: Fix for AWC-1321 - Using zero as items per page gives error for Alfresco repos in OpenSearch
   6471: Fix for AWC-1496 - OpenSearch dashlet can get in a state where search queries are not executed
   6472: Fix for AWC-1495. Searching additional attributes now working correctly for folders.
   6473: Fix for AR-1251 (Version error when saving new content via CIFS)
   6474: Updated bundles and installers - added missing files back into Linux bundle
   6475: LDAP and chainging authentication
          Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\security\authentication\AuthenticationUtil.java'
   6477: XForms WCM-696.
   6478: Fix for WCM-567 (IndexOutOfBoundsException when stepping through wizard rapidly)
   6480: Fix to issue when removing locks on directories.
   6481: Updated installer and config wizard to fix download option and config behaviour when called from installer.
   6482: Fix for WCM-1229 (properties sheet does not refresh)
   6483: Fix for AR-1511
   6484: Fix for AR-1351
   6485: Missed a unit test update


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 22:57:18 +00:00
parent b8c846e081
commit 223934268c
11 changed files with 492 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/web/scripts/ajax/common.js
View File

@@ -27,7 +27,7 @@ function handleCaughtError(err)
msg = err;
}
alert("An error occurred: " + msg);
alert("An error occurred:\n" + msg);
}
/**

15
source/web/scripts/ajax/opensearch.js
View File

@@ -206,17 +206,15 @@ Alfresco.OpenSearchClient.prototype =
var count = document.getElementById(this.id + _PAGE_SIZE_FIELD_ID).value;
// default the count if its invalid
if (count.length == 0 || isNaN(count))
if (count.length == 0 || isNaN(count) || count < 1)
{
count = 5;
document.getElementById(this.id + _PAGE_SIZE_FIELD_ID).value = count;
}
// issue the queries if there is enough search criteria
if (this.searchInProgress == false && term != null && term.length > 1)
{
// show that we are executing a search
this.searchInProgress = true;
// remove previous results (if necessary)
var resultsPanel = document.getElementById(this.id + _RESULTS_DIV_ID_SUFFIX);
if (resultsPanel != null)
@@ -235,6 +233,8 @@ Alfresco.OpenSearchClient.prototype =
var engCheckbox = document.getElementById(this.id + "-" + ose.id + _ENGINE_ENABLED_FIELD_ID);
if (engCheckbox != null && engCheckbox.checked)
{
// we found at least one engine - show that we are executing a search
this.searchInProgress = true;
this.issueSearchRequest(ose, term, count);
}
}
@@ -265,7 +265,7 @@ Alfresco.OpenSearchClient.prototype =
{
// replace the token with the engine label
var errorMsg = this.msgFailedGenerateUrl.replace("{0}", ose.label);
handleErrorYahoo(errorMsg);
handleCaughtError(errorMsg);
}
},
@@ -786,5 +786,8 @@ Alfresco.OpenSearchEngine.handleSearchError = function(ajaxResponse)
var engineLabel = clientInstance.enginesById[engineId].label;
var errorMsg = clientInstance.msgFailedSearch.replace("{0}", engineLabel);
handleErrorYahoo(errorMsg + ": " + ajaxResponse.status + " " + ajaxResponse.statusText);
handleCaughtError(errorMsg + ": " + ajaxResponse.status + " " + ajaxResponse.statusText);
// reset the search in progress flag
clientInstance.searchInProgress = false;
}

19
source/web/scripts/ajax/xforms.js
View File

@@ -3931,6 +3931,10 @@ dojo.declare("alfresco.xforms.Binding",
(_hasAttribute(this.xformsNode, alfresco.xforms.constants.XFORMS_PREFIX + ":type")
? this.xformsNode.getAttribute(alfresco.xforms.constants.XFORMS_PREFIX + ":type")
: null);
this._builtInType =
(_hasAttribute(this.xformsNode, alfresco.xforms.constants.ALFRESCO_PREFIX + ":builtInType")
? this.xformsNode.getAttribute(alfresco.xforms.constants.ALFRESCO_PREFIX + ":builtInType")
: null);
this.constraint =
(_hasAttribute(this.xformsNode, alfresco.xforms.constants.XFORMS_PREFIX + ":constraint")
? this.xformsNode.getAttribute(alfresco.xforms.constants.XFORMS_PREFIX + ":constraint")
@@ -3950,6 +3954,14 @@ dojo.declare("alfresco.xforms.Binding",
: (this.parent != null ? this.parent.getType() : null));
},
/** Returns the expected built in schema type for this binding. */
getBuiltInType: function()
{
return (this._builtInType != null
? this._builtInType
: (this.parent != null ? this.parent.getBuiltInType() : null));
},
/** Returns true if a node bound by this binding has a readonly value */
isReadonly: function()
{
@@ -3968,6 +3980,7 @@ dojo.declare("alfresco.xforms.Binding",
{
return ("{id: " + this.id +
",type: " + this.getType() +
",builtInType: " + this.getBuiltInType() +
",required: " + this.isRequired() +
",readonly: " + this.isReadonly() +
",nodeset: " + this.nodeset + "}");
@@ -4026,17 +4039,19 @@ dojo.declare("alfresco.xforms.XForm",
var xformsType = xformsNode.nodeName.toLowerCase();
var binding = this.getBinding(xformsNode);
var schemaType = binding ? binding.getType() : "*";
var schemaType = binding ? binding.getType() : null;
var builtInSchemaType = binding ? binding.getBuiltInType() : null;
dojo.debug("creating widget for xforms type " + xformsType +
" schema type " + schemaType +
" built in schema type " + builtInSchemaType +
" with appearance " + appearance);
var x = alfresco.xforms.widgetConfig[xformsType];
if (!x)
{
throw new Error("unknown type " + xformsNode.nodeName);
}
x = schemaType in x ? x[schemaType] : x["*"];
x = schemaType in x ? x[schemaType] : builtInSchemaType in x ? x[builtInSchemaType] : x["*"];
x = appearance in x ? x[appearance] : x["*"];
// dojo.debug(xformsType + ":" + schemaType + ":" + appearance + " =>" + x);
if (x === undefined)