roller/src/org/roller/presentation/users/actions WebsiteFormAction.java,1.9,1.9.2.1

Update of /cvsroot/roller/roller/src/org/roller/presentation/users/actions
In directory 
sc8-pr-cvs1:/tmp/cvs-serv4123/src/org/roller/presentation/users/actions

Modified Files:
      Tag: ROLLER_096_BRANCH
        WebsiteFormAction.java 
Log Message:
Don't allow user to pick same page for default page and day template

Index: WebsiteFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/users/actions/WebsiteFormAction.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** WebsiteFormAction.java      24 Oct 2002 12:13:28 -0000      1.9
--- WebsiteFormAction.java      23 Nov 2002 16:38:31 -0000      1.9.2.1
***************
*** 125,143 ****
                  WebsiteForm form = (WebsiteForm)actionForm;
  
!                 UserManager mgr =
!                     rreq.getRoller().getUserManager();
!                 mgr.storeWebsite( form.getData() );
! 
!                 request.getSession().setAttribute( 
RollerRequest.STATUS_MESSAGE,
!                     "Successfully submitted new Weblog templates");
! 
!                 request.getSession().setAttribute(
!                     RollerRequest.HOMEPAGEID_KEY,form.getId());
! 
!                 org.roller.presentation.caching.PageCache.flushCache(
!                     request.getSession().getServletContext());
! 
!                 // Make sure index page displays changes
!                 
RollerContext.getRollerContext(request).refreshUserDisplayBeans();
              }
              else
--- 125,152 ----
                  WebsiteForm form = (WebsiteForm)actionForm;
  
!                 UserManager mgr = rreq.getRoller().getUserManager();
!                 if(!form.getDefaultPageId().equals(form.getWeblogDayPageId()))
!                 {
!                     mgr.storeWebsite( form.getData() );
!     
!                     request.getSession().setAttribute( 
RollerRequest.STATUS_MESSAGE,
!                         "Successfully submitted new Weblog templates");
!     
!                     request.getSession().setAttribute(
!                         RollerRequest.HOMEPAGEID_KEY,form.getId());
!     
!                     org.roller.presentation.caching.PageCache.flushCache(
!                         request.getSession().getServletContext());
!     
!                     // Make sure index page displays changes
!                     
RollerContext.getRollerContext(request).refreshUserDisplayBeans();
!                 }
!                 else
!                 {
!                     request.getSession().setAttribute( 
!                         RollerRequest.ERROR_MESSAGE,
!                         "CHANGES REJECTED: Cannot set default page template "
!                         +"and day template to same template");
!                 }
              }
              else




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf