svn commit: r209355 - in /incubator/roller/trunk/src/org/roller: business/UserManagerImpl.java presentation/website/actions/UserBaseAction.java presentation/website/actions/UserNewAction.java

[ag...@apache.org]

Author: agilliland
Date: Tue Jul  5 16:56:29 2005
New Revision: 209355

URL: http://svn.apache.org/viewcvs?rev=209355&view=rev
Log:
A few changes to the process of new user registrations.

UserManagerImpl.addUser() forces users to select a theme and does not copy templates from that theme to a users custom templates.  This means that users now start out with 0 weblog templates.

Modified:
    incubator/roller/trunk/src/org/roller/business/UserManagerImpl.java
    incubator/roller/trunk/src/org/roller/presentation/website/actions/UserBaseAction.java
    incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java

Modified: incubator/roller/trunk/src/org/roller/business/UserManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/UserManagerImpl.java?rev=209355&r1=209354&r2=209355&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/UserManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/roller/business/UserManagerImpl.java Tue Jul  5 16:56:29 2005
@@ -348,6 +348,8 @@
         //
         // READ THEME FILES AND CREATE PAGES FOR USER
         //
+        /* new registrations require choosing a theme
+         * now that themes are shared we don't save page themplates -- Allen G
         Iterator iter = pages.keySet().iterator();
         while ( iter.hasNext() )
         {
@@ -374,6 +376,7 @@
                 website.setWeblogDayPageId(pd.getId());                 
             }                
         }
+        */
         
         if (adminUser) ud.grantRole("admin");
         

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/UserBaseAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/UserBaseAction.java?rev=209355&r1=209354&r2=209355&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/UserBaseAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/UserBaseAction.java Tue Jul  5 16:56:29 2005
@@ -19,12 +19,14 @@
 import org.roller.util.Utilities;
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.TreeSet;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import org.roller.model.RollerFactory;
 
 
 
@@ -87,7 +89,8 @@
         // prepare themes for interface
         ServletContext ctx = rreq.getServletContext();
         RollerContext rollerContext = RollerContext.getRollerContext(ctx);
-        String[] themes = rollerContext.getThemeNames();
+        List themes = 
+                RollerFactory.getRoller().getThemeManager().getEnabledThemesList();
         request.setAttribute( "themes", themes );
 
         // prepare locales & timezones

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java?rev=209355&r1=209354&r2=209355&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java Tue Jul  5 16:56:29 2005
@@ -140,7 +140,8 @@
             }
             
             String theme = form.getTheme();
-            HashMap pages = rollerContext.readThemeMacros(theme);
+            // this used to have theme pages before we had shared themes -- Allen G
+            HashMap pages = new HashMap();
             mgr.addUser( ud, pages, theme, form.getLocale(), form.getTimezone() );
             rreq.getRoller().commit();