[Jboss-svn-commits] JBL Code SVN: r1403 - in trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki: . plugins

[<jbo...@li...>]

Author: szimano
Date: 2005-10-17 15:39:49 -0400 (Mon, 17 Oct 2005)
New Revision: 1403

Modified:
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
Log:
admin - checked by role
fixed bug with admin console <table> thing


Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java	2005-10-17 16:07:35 UTC (rev 1402)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java	2005-10-17 19:39:49 UTC (rev 1403)
@@ -8,9 +8,8 @@
 import org.jboss.portlet.JBossRenderRequest;
 
 public class JBossPortalCredentials extends Credentials {
-
-	private String admin_user_name = "admin";
 	
+	private final String adminRoleName = "Admin";
 	private String name = null;
 	private boolean logedIn = false;
 	private boolean isAdmin = false;
@@ -26,7 +25,7 @@
 			if (jrReq.getUser() != null) {
 				name = jrReq.getUser().getUserName();
 				logedIn = true;
-				isAdmin = (name.equals(admin_user_name));
+				isAdmin = jrReq.getUser().getRoleNames().contains(adminRoleName);
 			}
 			else {
 				name = "Unknown";
@@ -45,7 +44,7 @@
 			if (jrReq.getUser() != null) {
 				name = jrReq.getUser().getUserName();
 				logedIn = true;
-				isAdmin = (name.equals(admin_user_name));
+				isAdmin = jrReq.getUser().getRoleNames().contains(adminRoleName);
 			}
 
 		}

Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java	2005-10-17 16:07:35 UTC (rev 1402)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java	2005-10-17 19:39:49 UTC (rev 1403)
@@ -66,18 +66,22 @@
 									+ WikiEngine.defaultPage + " page !";
 						}
 					}
-				}
-				else if ((SHOWDELETE)
+				} else if ((SHOWDELETE)
 						&& (wikiSession.getAttribute("var1")
 								.equals("deleteAtt"))) {
-					String attName = (wikiSession.getAttribute("var2") != null) ? (String)wikiSession.getAttribute("var2") : null;
-					
+					String attName = (wikiSession.getAttribute("var2") != null) ? (String) wikiSession
+							.getAttribute("var2")
+							: null;
+
 					if (attName != null) {
-						if (!wikiEngine.deleteAttachment(wikiPage.getName(), attName)) {
-							errorMsg = "There was problem with deleting "+attName+" from page "+wikiPage.getName()+" (see log for more info)";
+						if (!wikiEngine.deleteAttachment(wikiPage.getName(),
+								attName)) {
+							errorMsg = "There was problem with deleting "
+									+ attName + " from page "
+									+ wikiPage.getName()
+									+ " (see log for more info)";
 						}
-					}
-					else {
+					} else {
 						errorMsg = "Attachment to delete isn't specified";
 					}
 				}
@@ -88,7 +92,9 @@
 					.getPageContent());
 
 			adminConsole.append("\n<hr><h3>Admin console</h3>\n");
-			adminConsole.append("Go to <a href=\"").append(actionURL).append("&type=admin").append("\">ADMIN GENERAL CONSOLE</a><br />\n");
+			adminConsole.append("Go to <a href=\"").append(actionURL).append(
+					"&type=admin").append(
+					"\">ADMIN GENERAL CONSOLE</a><br />\n");
 			if (errorMsg.length() > 0) {
 				adminConsole.append("<i>" + errorMsg + "</i><br />\n");
 			}
@@ -97,19 +103,21 @@
 				Set<String> attSet = wikiEngine.getAttachmentsSet(wikiPage);
 
 				if (attSet != null) {
-					adminConsole.append("<h4>Attachments:</h4>\n<table border=\"0\">");
+					adminConsole
+							.append("<h4>Attachments:</h4>\n<table border=\"0\">");
 
 					for (String att : attSet) {
-						adminConsole.append("<tr><td>").append(att).append("</td><td><a href=\"").append(
-								actionURL).append("&page=").append(
-								wikiPage.getName()).append("&var1=deleteAtt")
-								.append("&var2=").append(att).append(
-										"\" >Delete</a></td></tr>");
+						adminConsole.append("<tr><td>").append(att).append(
+								"</td><td><a href=\"").append(actionURL)
+								.append("&page=").append(wikiPage.getName())
+								.append("&var1=deleteAtt").append("&var2=")
+								.append(att).append("\" >Delete</a></td></tr>");
 					}
 
+					adminConsole.append("</table><br />\n");
 				}
 
-				adminConsole.append("</table><br />\n<h4>Page managment:</h4>");
+				adminConsole.append("<h4>Page managment:</h4>");
 
 				if (!wikiPage.getName().equals(WikiEngine.defaultPage)) {