Merged V3.2E to HEAD

17429: Fixed ETHREEOH-2319 "Share - Sticky image or videos in web view"
   17435: Fixed EETHREEOH-3325 "Add group button is disabled on Admin Console - New User page"
   17445: Fixed ETHREEOH-3306 "Large number of root groups causes Groups admin tool to lockup the sever and Share" 
          - Search panel is now the default panel and the loading of root groups only occurs if you click the "Browse" button and change to the browse panel
   17446: Fix for unreported issue where the InMemoryTicketComponent did not check for null value from ticketsCache.
          Can occur on tomcat sesson expire and caused NPE to be logged.
   17449: Merged V3.1 to V3.2
      17257: *RECORD ONLY* Merged V3.2 to V3.1
         13685: ACT 8490 - TinyMCE fails if told to load unsupported language (interim fix only) (ETHREEOH-1615)
      17372: First part of fix for ETHREEOH-2519.
      17448: Merged DEV-TEMPORARY to V3.1
         17390: ETHREEOH-1619: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error
      17391: ETHREEOH-1058: It is possible to send invite email message with no subject from Web Project Wizard Step Seven - Email Users page
             ETHREEOH-1060: It is possible to send empty invitation email from Web Project Wizard Step Seven - Email users page
   17452: Fixed ETHREEOH-3306 "Large number of root groups causes Groups admin tool to lockup the sever and Share" part 2 
          - A "no result"-message was displayed to the user even though no search had been performed, now replaced by a usage message
   17453: Fixed ETHREEOH-2329 " Search doesn't work correctly on Groups page"
   17454: Fix for ETHREEOH-3084 - Error message appears in My Web Files part of My Alfresco Dashboard after configuring of the dashboard.
          - added new JavaScript and Template APIs to retrieve child nodes of a specific type - using fast direct DB NodeService call.
   17455: Fixed ETHREEOH-2329 " Search doesn't work correctly on Groups page" part 2
          - Added the prefix "*" to admin console group search as well to make it consistent

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-19 11:23:38 +00:00
parent 05046c516d
commit a28a05b20c
4 changed files with 74 additions and 44 deletions

View File

@@ -675,7 +675,10 @@ public class NavigationBean implements Serializable
{ {
if (this.currentNodeId == null) if (this.currentNodeId == null)
{ {
throw new AlfrescoRuntimeException("Cannot retrieve current Node if NodeId is null!"); // handle the possibility that we have no current location
// this is possible in cluster fail-over or due to a missing node
// default back to the current toolbar root location
this.processToolbarLocation(this.getToolbarLocation(), false);
} }
if (s_logger.isDebugEnabled()) if (s_logger.isDebugEnabled())
@@ -715,11 +718,14 @@ public class NavigationBean implements Serializable
SharedDeviceList shares = filesysConfig.getShares(); SharedDeviceList shares = filesysConfig.getShares();
Enumeration<SharedDevice> shareEnum = shares.enumerateShares(); Enumeration<SharedDevice> shareEnum = shares.enumerateShares();
while ( shareEnum.hasMoreElements() && diskShare == null) { while (shareEnum.hasMoreElements() && diskShare == null)
{
SharedDevice curShare = shareEnum.nextElement(); SharedDevice curShare = shareEnum.nextElement();
if (curShare.getContext() instanceof ContentContext) if (curShare.getContext() instanceof ContentContext)
{
diskShare = (DiskSharedDevice)curShare; diskShare = (DiskSharedDevice)curShare;
} }
}
if (diskShare != null) if (diskShare != null)
{ {

View File

@@ -36,12 +36,6 @@
<script language="JavaScript1.2"> <script language="JavaScript1.2">
function checkButtonState(inputField) function checkButtonState(inputField)
{
var disabled = (inputField.value.length == 0);
document.getElementById("contains-text-condition:ok-button").disabled = disabled;
}
function checkOkButtonState()
{ {
var input = document.getElementById("contains-text-condition:pattern_hour"); var input = document.getElementById("contains-text-condition:pattern_hour");
if (!input.disabled) if (!input.disabled)
@@ -53,6 +47,7 @@
return; return;
} }
} }
input = document.getElementById("contains-text-condition:pattern_minute"); input = document.getElementById("contains-text-condition:pattern_minute");
if (!input.disabled) if (!input.disabled)
{ {
@@ -64,9 +59,15 @@
} }
} }
document.getElementById("contains-text-condition:ok-button").disabled = false; input = document.getElementById("contains-text-condition:qname");
if (input.value.length == 0)
{
document.getElementById("contains-text-condition:ok-button").disabled = true;
return;
} }
document.getElementById("contains-text-condition:ok-button").disabled = false;
}
</script> </script>
<f:view> <f:view>

View File

@@ -35,6 +35,7 @@
window.onload = pageLoaded; window.onload = pageLoaded;
var okEnabled; var okEnabled;
var notifyEnabled = false;
function pageLoaded() function pageLoaded()
{ {
@@ -47,22 +48,31 @@
{ {
if (okEnabled) if (okEnabled)
{ {
if (document.getElementById("wizard:wizard-body:subject").value.length == 0) if (document.getElementById("wizard:wizard-body:subject").value.length > 0 ||
!notifyEnabled)
{ {
document.getElementById("wizard:finish-button").disabled = true; document.getElementById("wizard:finish-button").disabled = false;
document.getElementById("wizard:next-button").disabled = false;
} }
else else
{ {
document.getElementById("wizard:finish-button").disabled = false; document.getElementById("wizard:finish-button").disabled = true;
document.getElementById("wizard:next-button").disabled = true;
} }
} }
} }
function checkNotify(notify)
{
notifyEnabled = notify.value == "yes";
checkButtonState();
}
</script> </script>
</f:verbatim> </f:verbatim>
<h:panelGrid style="padding-bottom:12px" columns="1" cellpadding="2" cellspacing="2" border="0" width="100%"> <h:panelGrid style="padding-bottom:12px" columns="1" cellpadding="2" cellspacing="2" border="0" width="100%">
<h:outputText value="#{msg.send_email}" /> <h:outputText value="#{msg.send_email}" />
<h:selectOneRadio value="#{WizardManager.bean.notify}"> <h:selectOneRadio id="notify" value="#{WizardManager.bean.notify}" onchange="javascript:checkNotify(this);">
<f:selectItem itemValue="yes" itemLabel="#{msg.yes}" /> <f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
<f:selectItem itemValue="no" itemLabel="#{msg.no}" /> <f:selectItem itemValue="no" itemLabel="#{msg.no}" />
</h:selectOneRadio> </h:selectOneRadio>

View File

@@ -35,11 +35,14 @@
window.onload = pageLoaded; window.onload = pageLoaded;
var okEnabled; var okEnabled;
var notifyEnabled = false;
function pageLoaded() function pageLoaded()
{ {
document.getElementById("wizard:wizard-body:subject").focus(); document.getElementById("wizard:wizard-body:subject").focus();
okEnabled = !document.getElementById("wizard:finish-button").disabled; okEnabled = !document.getElementById("wizard:finish-button").disabled;
var radio = document.forms[0].elements["wizard:wizard-body:notify"];
notifyEnabled = radio[0].checked;
checkButtonState(); checkButtonState();
} }
@@ -47,22 +50,32 @@
{ {
if (okEnabled) if (okEnabled)
{ {
if (document.getElementById("wizard:wizard-body:subject").value.length == 0) if (document.getElementById("wizard:wizard-body:subject").value.length > 0 ||
!notifyEnabled)
{ {
document.getElementById("wizard:finish-button").disabled = true; document.getElementById("wizard:finish-button").disabled = false;
document.getElementById("wizard:next-button").disabled = false;
} }
else else
{ {
document.getElementById("wizard:finish-button").disabled = false; document.getElementById("wizard:finish-button").disabled = true;
document.getElementById("wizard:next-button").disabled = true;
} }
} }
} }
function checkNotify(notify)
{
notifyEnabled = notify.value == "yes";
checkButtonState();
}
</script> </script>
</f:verbatim> </f:verbatim>
<h:panelGrid style="padding-bottom:12px" columns="1" cellpadding="2" cellspacing="2" border="0" width="100%"> <h:panelGrid style="padding-bottom:12px" columns="1" cellpadding="2" cellspacing="2" border="0" width="100%">
<h:outputText value="#{msg.send_email}" /> <h:outputText value="#{msg.send_email}" />
<h:selectOneRadio value="#{InviteWebsiteUsersWizard.notify}"> <h:selectOneRadio id="notify" value="#{InviteWebsiteUsersWizard.notify}" onclick="javascript:checkNotify(this);">
<f:selectItem itemValue="yes" itemLabel="#{msg.yes}" /> <f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
<f:selectItem itemValue="no" itemLabel="#{msg.no}" /> <f:selectItem itemValue="no" itemLabel="#{msg.no}" />
</h:selectOneRadio> </h:selectOneRadio>