Author: gmazza
Date: Tue Jul 29 13:48:25 2014
New Revision: 1614350
URL: http://svn.apache.org/r1614350
Log:
ROL-2044 turn off ability for admin to remove himself from users page.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
Tue Jul 29 13:48:25 2014
@@ -52,20 +52,17 @@ public class BookmarkAdd extends UIActio
// bean for managing form data
private BookmarkBean bean = new BookmarkBean();
-
-
+
public BookmarkAdd() {
this.actionName = "bookmarkAdd";
this.desiredMenu = "editor";
this.pageTitle = "bookmarkForm.add.title";
}
-
-
+
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.POST);
}
-
-
+
public void myPrepare() {
try {
BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
Tue Jul 29 13:48:25 2014
@@ -48,7 +48,7 @@ public class CategoryAdd extends UIActio
this.pageTitle = "categoryForm.add.title";
}
- // author perms required
+ // admin perms required
public List<String> requiredWeblogPermissionActions() {
return Collections.singletonList(WeblogPermission.ADMIN);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
Tue Jul 29 13:48:25 2014
@@ -95,18 +95,12 @@ public class Members extends UIAction im
boolean error = false;
User user = getAuthenticatedUser();
if
(perms.getUser().getUserName().equals(user.getUserName())) {
- // if modifying self
- if (sval.equals(WeblogPermission.EDIT_DRAFT)
- && (perms.hasAction(WeblogPermission.POST) ||
perms.hasAction(WeblogPermission.ADMIN))) {
+ // can't modify self
+ if (!sval.equals(WeblogPermission.ADMIN)) {
error = true;
- addError("memberPermissions.noSelfDemotions");
+ addError("memberPermissions.noSelfModifications");
}
- if (sval.equals(WeblogPermission.POST) &&
perms.hasAction(WeblogPermission.ADMIN)) {
- error = true;
- addError("memberPermissions.noSelfDemotions");
- }
-
- }
+ }
if (!error && !perms.hasAction(sval)) {
if ("-1".equals(sval)) {
userMgr.revokeWeblogPermission(
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Tue Jul
29 13:48:25 2014
@@ -17,6 +17,9 @@
# To find unused strings, see
<roller-trunk>/docs/examples/i18n/check-default-resource-file.py
# (Usage instructions given at the top of that script)
#
+# When to use double-apostrophe for an apostrophe in resource strings? If
they're being rendered
+# via Struts s:text or JSTL fmt:message *with* parameters -- see
http://tinyurl.com/m5bqn2h
+#
# -- Common terms used to reduce the number of strings that need translation.
generic.all=All
generic.none=None
@@ -30,7 +33,7 @@ generic.save=Save
generic.edit=Edit
generic.delete=Delete
generic.tagline=Tagline
-generic.system.error=Roller system error - Have administrator check Roller
logfiles for more information.
+generic.system.error=Roller system error - Have administrator check Roller
logs for more information.
# -------------------------------------------------------------
BookmarkForm.jsp
@@ -66,7 +69,7 @@ This is your blog''s main bookmarks fold
The bookmarks you keep here will appear in the blogroll section of your blog \
(assuming that you are using one of the default themes). You can create \
additional bookmark folders, but you will have to add corresponding bookmark
display \
-macros to your weblog''s templates if you wish to display their contents.
+macros to your weblog''s templates if you wish to display their contents.
bookmarksForm.subtitle=Manage bookmarks in weblog <span>{0}</span>
@@ -448,13 +451,13 @@ error.text.404=The file that you request
error.permissionDenied.title=Permission Denied
error.permissionDenied.prompt=Possible causes:
error.permissionDenied.reason0=You requested a weblog entry that you do not
have \
-permission to edit (perhaps one you''ve already submitted for review?).
+permission to edit (perhaps one you've already submitted for review?).
error.permissionDenied.reason1=You tried to save an object from "stale" web
page, \
left by an earlier login under a different user account.
error.permissionDenied.reason2=You logged in using incorrect capitalization of
\
your username. To resolve this problem, logout and login again with your \
correct username.
-error.permissionDenied.reason3=Your blog server''s database connection is \
+error.permissionDenied.reason3=Your blog server's database connection is \
misconfigured. To resolve this problem, see your system administrator.
error.unexpected=Unexpected error. If this error occurs again, please contact
the administrator.
@@ -898,7 +901,7 @@ memberPermissions.author=Author
memberPermissions.limited=Limited
memberPermissions.remove=Remove
-memberPermissions.noSelfDemotions=You''re not allowed to demote yourself
+memberPermissions.noSelfModifications=Only another admin may alter your role.
memberPermissions.membersRemoved=Removed {0} user(s)
memberPermissions.membersChanged=Changed permission for {0} user(s)
@@ -910,11 +913,11 @@ memberPermissions.saveError=Error saving
memberPermissions.inviteMember=Invite new member
memberPermissions.whyInvite=Invite somebody to help you write your weblog.
-memberPermissions.permissionsHelpTitle=What are permissions?
+memberPermissions.permissionsHelpTitle=Permission Definitions
memberPermissions.permissionHelp=\
-<b>Admin</b> permission allows user to post entries, manage weblog and its
users<br /> \
-<b>Author</b> permission allows user to post entries, but not to manage
weblog<br /> \
-<b>Limited</b> permission allows user to save draft entries only
+<b>Admin:</b> Full control including posting, user management, and weblog
design.<br /> \
+<b>Author:</b> Can post entries and moderate comments.<br /> \
+<b>Limited:</b> No posting ability, can save draft entries and submit them for
review.
# --------------------------------------------------------- New user
registation
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Tue
Jul 29 13:48:25 2014
@@ -505,7 +505,6 @@ memberPermissions.inviteMember=Mitgliede
memberPermissions.limited=Beschr\u00E4nkt
memberPermissions.membersChanged=Rechte ge\u00E4ndert f\u00FCr {0} Benuter.
memberPermissions.membersRemoved={0} Benutzer entfernt
-memberPermissions.noSelfDemotions=Sie k\u00F6nnen sich nicht selbst
gegradieren.
memberPermissions.permissionHelp=<b>Administratorrechte</b> erlauben es
Benutzern, Eintr\u00E4ge zu schreiben, den Weblog samt der Benutzer zu
verwalten.<br /> <b>Autorenrechte</b> erlauben es Benutzern, Eintr\u00E4ge zu
schreiben aber nicht den Weblog zu verwalten.<br /> <b>Beschr\u00E4nkte
Rechte</b> erlauben es Benutzern, entworfene Eintr\u00E4ge zu speichern.
memberPermissions.permissionsHelpTitle=Was sind Rechte?
memberPermissions.remove=Entfernen
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Tue
Jul 29 13:48:25 2014
@@ -280,7 +280,6 @@ memberPermissions.author=Autor
memberPermissions.limited=Limitado
memberPermissions.remove=Eliminar
memberPermissions.inviteMember=Invitar a un nuevo miembro
-memberPermissions.noSelfDemotions=\u00A1No le est\u00E1 permitido quitarse
permisos\!
memberPermissions.membersRemoved={0} usuario(s) eliminado(s)
memberPermissions.membersChanged=Permiso cambiado para {0} usuario(s)
memberPermissions.confirmRemove=\u00BFEst\u00E1 seguro de que desea eliminar
miembros de este weblog?
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Tue
Jul 29 13:48:25 2014
@@ -562,7 +562,6 @@ memberPermissions.author=Auteur
memberPermissions.limited=Limité
memberPermissions.remove=Effacer
-memberPermissions.noSelfDemotions=Vous ne pouvez pas changer ces droits pour
vous même.
memberPermissions.membersRemoved={0} utilisateurs enlevés.
memberPermissions.membersChanged=Les permissions d'accés de {0}
utilisateur(s) ont été changées.
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
Tue Jul 29 13:48:25 2014
@@ -462,7 +462,6 @@ memberPermissions.author=\u8457\u8005
memberPermissions.limited=\u4E0B\u66F8\u304D
memberPermissions.remove=\u9664\u540D
-memberPermissions.noSelfDemotions=\u3042\u306A\u305F\u306E\u6A29\u9650\u30EC\u30D9\u30EB\u306E\u5909\u66F4\u306F\u3067\u304D\u307E\u305B\u3093
memberPermissions.membersRemoved={0}\u4EBA\u306E\u30E6\u30FC\u30B6\u3092\u9664\u540D\u3057\u307E\u3057\u305F
memberPermissions.membersChanged={0}\u4EBA\u306E\u30E6\u30FC\u30B6\u6A29\u9650\u3092\u5909\u66F4\u3057\u307E\u3057\u305F
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Tue
Jul 29 13:48:25 2014
@@ -634,7 +634,6 @@ memberPermissions.author=\uc800\uc791\uc
memberPermissions.limited=\uc81c\ud55c\ub428
memberPermissions.remove=\uc0ad\uc81c
-memberPermissions.noSelfDemotions=\uc790\uae30 \uc790\uc2e0\uc758
\uad8c\ud55c\uc744 \uc904\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
memberPermissions.membersRemoved={0} \uba85\uc758 \uc0ac\uc6a9\uc790
\uc81c\uac70
memberPermissions.membersChanged={0} \uba85\uc758 \uc0ac\uc6a9\uc790
\uad8c\ud55c \ubcc0\uacbd
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Tue
Jul 29 13:48:25 2014
@@ -375,7 +375,6 @@ memberPermissions.limited=\u041e\u0433\u
memberPermissions.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
memberPermissions.inviteMember=\u041f\u0440\u0438\u0433\u043b\u0430\u0441\u0438\u0442\u044c
\u043d\u043e\u0432\u043e\u0433\u043e \u0447\u043b\u0435\u043d\u0430
-memberPermissions.noSelfDemotions=\u0412\u044b \u043d\u0435
\u043c\u043e\u0436\u0435\u0442\u0435
\u043f\u043e\u043d\u0438\u0437\u0438\u0442\u044c \u0441\u0435\u0431\u044f
\u0432 \u043f\u0440\u0430\u0432\u0430\u0445
memberPermissions.membersRemoved=\u0423\u0434\u0430\u043b\u0435\u043d\u043d\u044b\u0439
(-\u044b\u0435) {0}
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
(-\u043b\u0438)
memberPermissions.membersChanged=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u043d\u044b\u0435
\u043f\u0440\u0430\u0432\u0430 \u0434\u043b\u044f
{0}\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
(-\u043b\u0435\u0439)
memberPermissions.confirmRemove=\u0412\u044b
\u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e
\u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c
\u0447\u043b\u0435\u043d\u043e\u0432 \u0438\u0437
\u044d\u0442\u043e\u0433\u043e \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430?
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Tue Jul 29 13:48:25 2014
@@ -288,7 +288,6 @@ memberPermissions.inviteMember=\u9080\u8
memberPermissions.limited=\u9650\u5236
memberPermissions.membersChanged=\u66f4\u6539\u7528\u6237 {0}
\u7684\u8bb8\u53ef\u534f\u8bae
memberPermissions.membersRemoved=\u5220\u9664\u7528\u6237 {0}
-memberPermissions.noSelfDemotions=\u60a8\u4e0d\u80fd\u81ea\u6211\u964d\u7ea7
memberPermissions.permissionHelp=<b>\u7ba1\u7406\u5458</b>\u8bb8\u53ef\u534f\u8bae\u5141\u8bb8\u7528\u6237\u53d1\u5e03\u65e5\u5fd7\uff0c\u7ba1\u7406\u65e5\u5fd7\u548c\u4ed6\u7684\u6210\u5458\u7528\u6237<br
/>
<b>\u4f5c\u8005</b>\u8bb8\u53ef\u534f\u8bae\u5141\u8bb8\u7528\u6237\u53d1\u5e03\u65e5\u5fd7\uff0c\u4f46\u662f\u4e0d\u80fd\u7ba1\u7406\u65e5\u5fd7<br
/><b>\u9650\u5236</b>\u8bb8\u53ef\u534f\u8bae\u53ea\u5141\u8bb8\u7528\u6237\u64b0\u5199\u65e5\u5fd7\u8349\u7a3f\u3002
memberPermissions.permissionsHelpTitle=\u8bb8\u53ef\u534f\u8bae\u662f\u4ec0\u4e48?
memberPermissions.remove=\u79fb\u9664
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml?rev=1614350&r1=1614349&r2=1614350&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
Tue Jul 29 13:48:25 2014
@@ -23,12 +23,14 @@
listed here should instead be changed on the Roller Admin Settings page.
This file defines what properties are made available to get/set
- during the running of the Roller application. These properties
- are stored in the database (roller_properties table) and the code *must* be
- able to make use of changed values during runtime.
+ during the running of the Roller application (in contrast to the settings
+ in roller-custom.properties which are read once before Roller startup).
+ These runtime properties are stored in the database (roller_properties
+ table) and the code *must* be able to make use of changed values during
+ runtime.
Also included in this file is meta-data which defines what class
- of property we are dealing with, it's default value, and information
+ of property we are dealing with, its default value, and information
on how to populate the display that allows for changing the value.
NOTE: order does matter!! the display is populated in a linear fashion
