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

Browse Source 
13173: Merged V2.1-A to V3.1
      10964: Fix for ADB-81: String 'Template' in Japanese is not good format
      10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
      10972: Fix for ADB-95: All templates should be parameterized using a  such that they pickup the server name and port number of the current installation
      10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
   13174: Merged V2.1-A to V3.1
      10975: Fix for ADB-118: Content attributes not localized [client templates]
   13182: Merged V2.1-A to V3.1
      11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
      11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
   13190: Merged V2.1-A to V3.1
      11070: Fix for ADB-120 ACT 4773
   13192: Merged V2.1-A to V3.1
      11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
   13193: Merged V2.1-A to V3.1
      8395: Remove user and group admin actions from Admin console [added config switch - off by default]
      8584: Removed option for user to change password [added config switch - off by default]
      10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
      10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
   13194: Merged V2.1-A to V3.1
      12095: Fix for ADB-131
   13195: Merged V2.1-A to V3.1
      12097: Fix for ADB-133, ADB-134
      12102: Fix for ADB-139
   13196: Merged V2.1-A to V3.1
      12350: Fix for ADB-142
   13197: Merged V2.1-A to V3.1
      12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
      12878: Merged record-only for V2.1-A to HEAD 
         12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
   13198: Merged V2.1-A to V3.1
      12977: Fix for ADB-158: Intermittent error while accessing the login page
      13142: Another fix for ADB-158: Intermittent error while accessing the login page
   13199: Merged V2.1-A to V3.1
      11589: Fix for ADB-95: All templates should be parameterized

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 14:45:20 +00:00
parent a07c125fd3
commit 1aa1ef1f13
64 changed files with 493 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,10 @@ Alfresco.OpenSearchClient.prototype =
msgLastPage: null,
msgInvalidTermLength: null,
minTermLength: 0,
/**
* Registers an OpenSearch engine to be called when performing queries
*/
@@ -73,6 +77,18 @@ Alfresco.OpenSearchClient.prototype =
this.enginesById[id] = se;
},
/**
* Registers an OpenSearch engine to be called when performing queries.
* Extra parameter is the minimum search term length.
*/
registerOpenSearchEngine: function(id, label, url, minLengh)
{
var se = new Alfresco.OpenSearchEngine(id, label, url);
this.engines[this.engines.length] = se;
this.enginesById[id] = se;
this.minTermLength = minLengh;
},
/**
* Sets the 'No Results' message
*/
@@ -137,6 +153,14 @@ Alfresco.OpenSearchClient.prototype =
this.msgLastPage = msg;
},
/**
* Sets the invalid term length message
*/
setMsgInvalidTermLength: function(msg)
{
this.msgInvalidTermLength = msg;
},
/**
* Handles the key press event, if ENTER is pressed execute the query
*/
@@ -205,6 +229,14 @@ Alfresco.OpenSearchClient.prototype =
var term = document.getElementById(this.id + _SEARCH_TERM_FIELD_ID).value;
var count = document.getElementById(this.id + _PAGE_SIZE_FIELD_ID).value;
// ADB-134 fix (Error message about not enough search criteria)
if (term.length < this.minTermLength)
{
var errorMsg = this.msgInvalidTermLength.replace("{0}", this.minTermLength);
handleCaughtError(errorMsg);
return;
}
// default the count if its invalid
if (count.length == 0 || isNaN(count) || count < 1)
{
@@ -212,8 +244,8 @@ Alfresco.OpenSearchClient.prototype =
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)
// issue the queries if there is enough search criteria (& ADB-133 fix: parametrized minTermLength)
if (this.searchInProgress == false && term != null && term.length >= this.minTermLength)
{
// remove previous results (if necessary)
var resultsPanel = document.getElementById(this.id + _RESULTS_DIV_ID_SUFFIX);