svn commit: r917387 - in /incubator/jspwiki/trunk/src/java/org/apache/wiki/action: AdminActionBean.java AdministerProfilesActionBean.java

[ajaquith]

Author: ajaquith
Date: Mon Mar  1 05:18:40 2010
New Revision: 917387

URL: http://svn.apache.org/viewvc?rev=917387&view=rev
Log:
Small changes to Admin/AdministerProfiles action beans as part of a gradual 
overhaul to the Admin JSPs, which are being Stripesed.

Modified:
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java
    
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java

Modified: 
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java?rev=917387&r1=917386&r2=917387&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java 
(original)
+++ 
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java 
Mon Mar  1 05:18:40 2010
@@ -117,6 +117,10 @@
                 }
             };
         }
-        return new TemplateResolution( "admin/Admin.jsp" ).addParameter( 
"tab", "security" );
+        if ( getContext().getRequest().getParameter( "tab" ) == null )
+        {
+            return new TemplateResolution( "admin/Admin.jsp" ).addParameter( 
"tab", "security" );
+        }
+        return new TemplateResolution( "admin/Admin.jsp" );
     }
 }

Modified: 
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java?rev=917387&r1=917386&r2=917387&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java
 (original)
+++ 
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java
 Mon Mar  1 05:18:40 2010
@@ -163,6 +163,6 @@
         }
         
         // Forward to the template JSP
-        return new TemplateResolution( "admin/Admin.jsp").addParameter( "tab", 
"users" );
+        return new TemplateResolution( "admin/Users.jsp").addParameter( "tab", 
"users" );
     }
 }