Author: snoopdave
Date: Tue Mar 30 04:36:01 2010
New Revision: 928978
URL: http://svn.apache.org/viewvc?rev=928978&view=rev
Log:
Fixed a couple of bugs in menu parsing
Also, fixed some old attribute names and incorrect permission names in
editor-menu.xml
Both were regressions introduced with user management stuff.
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?rev=928978&r1=928977&r2=928978&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
Tue Mar 30 04:36:01 2010
@@ -182,10 +182,10 @@ public class MenuHelper {
if (includeItem) {
// weblog permissions check
- if (configTab.getWeblogPermissionActions() != null
- &&
!configTab.getWeblogPermissionActions().isEmpty()) {
- WeblogPermission perm = new
WeblogPermission(weblog, configTab.getWeblogPermissionActions());
- includeTab = umgr.checkPermission(perm, user);
+ if (configTabItem.getWeblogPermissionActions() != null
+ &&
!configTabItem.getWeblogPermissionActions().isEmpty()) {
+ WeblogPermission perm = new
WeblogPermission(weblog, configTabItem.getWeblogPermissionActions());
+ includeItem = umgr.checkPermission(perm, user);
}
}
Modified:
roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=928978&r1=928977&r2=928978&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
(original)
+++
roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
Tue Mar 30 04:36:01 2010
@@ -23,7 +23,7 @@ Each menu or menu item is governed by fo
-->
<menu-bar>
- <menu name="tabbedmenu.weblog" globalPerms="limited" weblogPerms="editor">
+ <menu name="tabbedmenu.weblog" weblogPerms="edit_draft"
globalPerms="login" >
<menu-item action="entryAdd"
name="tabbedmenu.weblog.newEntry"
@@ -39,42 +39,42 @@ Each menu or menu item is governed by fo
<menu-item action="comments"
name="tabbedmenu.admin.commentManagement"
globalPerms="login"
- weblogPerms="author" />
+ weblogPerms="post" />
<menu-item action="categories"
name="tabbedmenu.weblog.categories"
globalPerms="login"
- perms="admin"
+ weblogPerms="post"
subactions="categoryAdd,categoryEdit,categoryRemove" />
<menu-item action="bookmarks"
name="tabbedmenu.bookmarks.allFolders"
globalPerms="login"
- weblogPerms="post"
+ weblogPerms="admin"
subactions="bookmarkAdd,bookmarkEdit,folderAdd,folderEdit,bookmarksImport" />
<menu-item action="mediaFileView"
name="tabbedmenu.weblog.mediaFiles"
globalPerms="login"
- perms="post"
+ weblogPerms="post"
subactions="mediaFileAdd,mediaFileHierarchicalView,mediaFileSearch" />
<menu-item action="weblogExport"
enabledProperty="weblog.export.enabled"
name="tabbedmenu.weblog.export"
- roles="editor"
- perms="author"
+ globalPerms="login"
+ weblogPerms="admin"
subactions="exportEntries,exportResources"/>
<menu-item action="referrers"
name="tabbedmenu.weblog.referers"
globalPerms="login"
- weblogPerms="post"
+ weblogPerms="admin"
enabledProperty="referrers.processing.enabled" />
</menu>
- <menu name="tabbedmenu.design" weblogPerms="editor"
enabledProperty="themes.customtheme.allowed">
+ <menu name="tabbedmenu.design" weblogPerms="admin" globalPerms="login"
enabledProperty="themes.customtheme.allowed">
<menu-item action="themeEdit"
name="tabbedmenu.website.themes"
@@ -95,7 +95,7 @@ Each menu or menu item is governed by fo
</menu>
- <menu name="tabbedmenu.website" weblogPerms="editor">
+ <menu name="tabbedmenu.website" weblogPerms="admin">
<menu-item action="weblogConfig"
name="tabbedmenu.website.settings"
