![Error](");
out.write(contextPath);
- out.write("/images/icons/info_icon.gif) ");
+ out.write("/images/icons/info_icon.gif' alt='");
+ out.write(Utils.encode(errorHint));
+ out.write("'/>");
out.write(" | ");
while (messages.hasNext())
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
index acc0643372..854b724358 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
@@ -152,7 +152,7 @@ public class ModeListRenderer extends BaseRenderer
}
String menuId = UIMenu.getNextMenuId(list, context);
- out.write(" | ");
@@ -375,7 +375,7 @@ public class ModeListRenderer extends BaseRenderer
}
// output item link
- out.write(" | ");
+ out.write(" | ");
if (!list.isDisabled() && !item.isDisabled())
{
out.write(" | | ');
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
index 95918a5e74..d41c8e6ac4 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
@@ -105,7 +105,8 @@ public class UIOpenSearch extends SelfRenderingComponent
out.write(" = new Alfresco.OpenSearchClient('");
out.write(clientId);
out.write("');\n");
-
+ // ADB-133: Synchronizing lengths of search fields
+ final Integer searchMinimum = Application.getClientConfig(FacesContext.getCurrentInstance()).getSearchMinimum();
// register the engines on the client
for (OpenSearchEngine engine : engines)
{
@@ -116,7 +117,9 @@ public class UIOpenSearch extends SelfRenderingComponent
out.write(engine.getLabel());
out.write("', '");
out.write(engine.getUrl());
- out.write("');\n");
+ out.write("', ");
+ out.write(searchMinimum.toString());
+ out.write(");\n");
}
// pass in NLS strings
@@ -160,6 +163,11 @@ public class UIOpenSearch extends SelfRenderingComponent
out.write(Application.getMessage(context, "last_page"));
out.write("\");\n");
+ out.write(clientId);
+ out.write(".setMsgInvalidTermLength(\"");
+ out.write(Application.getMessage(context, "search_minimum"));
+ out.write("\");\n");
+
out.write("\n");
// write out the HTML
diff --git a/source/web/index.jsp b/source/web/index.jsp
index fb07091fe4..a6ecdfdb2a 100644
--- a/source/web/index.jsp
+++ b/source/web/index.jsp
@@ -120,12 +120,15 @@ if (request.getMethod().equalsIgnoreCase("GET"))
if (NavigationBean.LOCATION_MYALFRESCO.equals(location))
{
// Clear previous location - Fixes the issue ADB-61
- FacesContext fc = FacesContext.getCurrentInstance();
+ FacesContext fc = FacesHelper.getFacesContext(request, response, application);
if (fc != null)
{
NavigationBean navigationBean = (NavigationBean)FacesHelper.getManagedBean(fc, "NavigationBean");
- navigationBean.setLocation(null);
- navigationBean.setToolbarLocation(null);
+ if (navigationBean != null)
+ {
+ navigationBean.setLocation(null);
+ navigationBean.setToolbarLocation(null);
+ }
}
// Send redirect
response.sendRedirect(request.getContextPath() + "/faces/jsp/dashboards/container.jsp");
diff --git a/source/web/jsp/admin/admin-console.jsp b/source/web/jsp/admin/admin-console.jsp
index ce0d206d37..d6eae781a6 100644
--- a/source/web/jsp/admin/admin-console.jsp
+++ b/source/web/jsp/admin/admin-console.jsp
@@ -28,60 +28,23 @@
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
-
-
-
- |
-
-
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
-
- |
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index a279055e0c..c2d526f721 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -91,7 +91,7 @@
<%-- Main area --%>
|
-|
+ |
:
|
diff --git a/source/web/jsp/users/user-console.jsp b/source/web/jsp/users/user-console.jsp
index aac62b57c8..5f50ffa955 100644
--- a/source/web/jsp/users/user-console.jsp
+++ b/source/web/jsp/users/user-console.jsp
@@ -34,7 +34,7 @@
+ rendered="#{!NavigationBean.isGuest && NavigationBean.allowUserConfig}" />
+ rendered="#{!NavigationBean.isGuest && NavigationBean.allowUserConfig}" />
diff --git a/source/web/jsp/wcm/add-content-dialog.jsp b/source/web/jsp/wcm/add-content-dialog.jsp
index f24e438919..2316abdf75 100644
--- a/source/web/jsp/wcm/add-content-dialog.jsp
+++ b/source/web/jsp/wcm/add-content-dialog.jsp
@@ -197,7 +197,7 @@
{
finishButtonPressed = false;
return validateName(document.getElementById("dialog:dialog-body:file-name"),
- '', true);
+ decodeURI(''), true);
}
else
{
diff --git a/source/web/scripts/ajax/opensearch.js b/source/web/scripts/ajax/opensearch.js
index fd11a478c8..e6abeece37 100644
--- a/source/web/scripts/ajax/opensearch.js
+++ b/source/web/scripts/ajax/opensearch.js
@@ -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);
|