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

Browse Source 
16798: Fix for ETHREEOH-1305. Null Path error if user clicks on Next Item icon on View Details page.
   16800: Fix for ETHREEOH-2884 - Language icon near the content is displayed as "NULL". User can't change any language.
   16805: Merged DEV-TEMPORARY to V3.2
      16789: ETHREEOH-1895: Performing "Done Editing" action simultaneously leads to NPE
   16806: ETHREEOH-1898 - Delete icon missing from Shortcut list in Shelf
   16807: Fix for ETHREEOH-2356 - Error message appears when user tries to apply template to locked content.
      - missed one of the actions with the evaluator wrapping first time around.
   16808: Minor javadoc update
   16815: XHTML compliance fixes. Dashboard pages etc. now render as fully compliant XHTML again.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-15 08:11:27 +00:00
parent fdc7ae1fe5
commit 755abcca82
63 changed files with 401 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/java/org/alfresco/web/bean/NavigationBean.java
View File

@@ -93,7 +93,7 @@ public class NavigationBean implements Serializable
/** Public JSF Bean name */
public static final String BEAN_NAME = "NavigationBean";
private static Log logger = LogFactory.getLog(NavigationBean.class);
private static Log logger = LogFactory.getLog(NavigationBean.class);
/**
* Default constructor
@@ -271,6 +271,16 @@ public class NavigationBean implements Serializable
this.shelfExpanded = expanded;
}
/**
* Return the width of the main work area depending on the visibility of the Shelf panel
*
* @return width, which will either be "80%" or "100%"
*/
public String getWorkAreaWidth()
{
return this.shelfExpanded ? "80%" : "100%";
}
/**
* @return Returns the array containing the expanded state of the shelf items
*/
@@ -853,7 +863,7 @@ public class NavigationBean implements Serializable
}
/**
* @return true if the Company home node is accessible to the current user
* @return true if the Company home node is accessible to the current user
*/
public boolean getCompanyHomeVisible()
{
@@ -880,29 +890,29 @@ public class NavigationBean implements Serializable
}
/**
* @return true if the Guest home node is accessible to the current user
* @return true if the Guest home node is accessible to the current user
*/
public boolean getGuestHomeVisible()
{
try
try
{
if (this.getAuthService().guestUserAuthenticationAllowed())
{
Node guestHome = getGuestHomeNode();
return guestHome != null && guestHome.hasPermission(PermissionService.READ);
}
else
{
return false;
}
}
catch (Throwable e)
{
if (logger.isDebugEnabled())
{
logger.debug("getGuestHomeVisible failed", e);
if (this.getAuthService().guestUserAuthenticationAllowed())
{
Node guestHome = getGuestHomeNode();
return guestHome != null && guestHome.hasPermission(PermissionService.READ);
}
return false;
else
{
return false;
}
}
catch (Throwable e)
{
if (logger.isDebugEnabled())
{
logger.debug("getGuestHomeVisible failed", e);
}
return false;
}
}