Author: ghuber
Date: Mon Jan 27 12:20:15 2014
New Revision: 1561651
URL: http://svn.apache.org/r1561651
Log:
Another fix for ROL-1983 to allow the invite /authoring/invite.rol page to
work. Non admin shows screen name rather than email address.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
roller/trunk/app/src/main/webapp/WEB-INF/web.xml
roller/trunk/app/src/main/webapp/roller-ui/scripts/ajax-user.js
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java?rev=1561651&r1=1561650&r2=1561651&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
Mon Jan 27 12:20:15 2014
@@ -47,10 +47,9 @@ import org.apache.roller.weblogger.ui.re
* username2, emailaddress2 <br/>
* usernameN, emailaddressN <br/>
*
- * web.xml
- * <url-pattern>/roller-ui/admin/userdata/*</url-pattern>
- * security.xml
- * <intercept-url pattern="/roller-ui/admin/**" access="admin"/>
+ * web.xml: <url-pattern>/roller-ui/authoring/userdata/*</url-pattern>
+ * security.xml: <intercept-url pattern="/roller-ui/authoring/**"
+ * access="admin,editor"/>
*/
public class UserDataServlet extends HttpServlet {
@@ -60,6 +59,8 @@ public class UserDataServlet extends Htt
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
+ boolean admin = false;
+
// This user check can be removed as we protected by spring (see
above).
WeblogRequest weblogRequest = null;
try {
@@ -67,10 +68,13 @@ public class UserDataServlet extends Htt
// Make sure we have the correct authority
User user = weblogRequest.getUser();
- if (user == null || !user.hasGlobalPermission("admin")) {
- // user not found or not admin
+ if (user == null) {
+ // user not found
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
+ } else if (user.hasGlobalPermission("admin")) {
+ // admin
+ admin = true;
}
} catch (Exception e) {
@@ -105,8 +109,13 @@ public class UserDataServlet extends Htt
enabledOnly, offset, length);
for (User user : users) {
response.getWriter().print(user.getUserName());
- response.getWriter().print(",");
- response.getWriter().println(user.getEmailAddress());
+ if (admin) {
+ response.getWriter().print(",");
+ response.getWriter().println(user.getEmailAddress());
+ } else{
+ response.getWriter().print(",");
+ response.getWriter().println(user.getScreenName());
+ }
}
response.flushBuffer();
} catch (WebloggerException e) {
Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1561651&r1=1561650&r2=1561651&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Mon Jan 27 12:20:15 2014
@@ -411,7 +411,7 @@
<servlet-mapping>
<servlet-name>UserDataServlet</servlet-name>
- <url-pattern>/roller-ui/admin/userdata/*</url-pattern>
+ <url-pattern>/roller-ui/authoring/userdata/*</url-pattern>
</servlet-mapping>
Modified: roller/trunk/app/src/main/webapp/roller-ui/scripts/ajax-user.js
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/scripts/ajax-user.js?rev=1561651&r1=1561650&r2=1561651&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/scripts/ajax-user.js (original)
+++ roller/trunk/app/src/main/webapp/roller-ui/scripts/ajax-user.js Mon Jan 27
12:20:15 2014
@@ -30,7 +30,7 @@ function createRequestObject() {
var http = createRequestObject();
var init = false;
var isBusy = false;
-var userURL = "<%= request.getContextPath() %>" +
"/roller-ui/admin/userdata?length=50";
+var userURL = "<%= request.getContextPath() %>" +
"/roller-ui/authoring/userdata?length=50";
function onUserNameFocus(enabled) {
if (!init) {
