Index: tool/src/java/org/sakaiproject/signup/tool/jsf/NewSignupMeetingBean.java =================================================================== --- tool/src/java/org/sakaiproject/signup/tool/jsf/NewSignupMeetingBean.java (revision 9546) +++ tool/src/java/org/sakaiproject/signup/tool/jsf/NewSignupMeetingBean.java (working copy) @@ -102,11 +102,15 @@ //New Location added in the editable field private String customLocation; + private List locations=null; + //Category selected from the dropdown private String selectedCategory; //New Category added in the editable field private String customCategory; + + private List categories = null; private String repeatType; @@ -462,6 +466,8 @@ this.selectedCategory=null; this.customCategory=""; this.creatorUserId=null; + this.locations=null; + this.categories=null; /*clean up everything in getUserDefineTimeslotBean*/ getUserDefineTimeslotBean().reset(UserDefineTimeslotBean.NEW_MEETING); } @@ -472,10 +478,12 @@ * @return list of allLocations */ public List getAllLocations(){ + if(locations ==null){ + locations = new ArrayList(); + locations.addAll(Utilities.getSignupMeetingsBean().getAllLocations()); + locations.add(0, new SelectItem(Utilities.rb.getString("select_location"))); + } - List locations = new ArrayList(); - locations.addAll(Utilities.getSignupMeetingsBean().getAllLocations()); - locations.add(0, new SelectItem(Utilities.rb.getString("select_location"))); return locations; } @@ -485,10 +493,11 @@ * @return list of categories */ public List getAllCategories(){ - - List categories = new ArrayList(); - categories.addAll(Utilities.getSignupMeetingsBean().getAllCategories()); - categories.add(0, new SelectItem(Utilities.rb.getString("select_category"))); + if(categories ==null){ + categories = new ArrayList(); + categories.addAll(Utilities.getSignupMeetingsBean().getAllCategories()); + categories.add(0, new SelectItem(Utilities.rb.getString("select_category"))); + } return categories; } Index: tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/CopyMeetingSignupMBean.java =================================================================== --- tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/CopyMeetingSignupMBean.java (revision 9546) +++ tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/CopyMeetingSignupMBean.java (working copy) @@ -135,6 +135,9 @@ "signup.email.notification.mandatory.for.newMeeting", "true")) ? true : false; private boolean mandatorySendEmail = NEW_MEETING_SEND_EMAIL; + + private List categories = null; + private List locations=null; /** * this reset information which contains in this UIBean lived in a session @@ -198,6 +201,8 @@ this.selectedCategory = this.signupMeeting.getCategory(); this.customLocation=""; this.customCategory=""; + this.categories = null; + this.locations = null; populateDataForBeginDeadline(this.signupMeeting); @@ -626,10 +631,11 @@ * @return list of allLocations */ public List getAllLocations(){ - - List locations= new ArrayList(); - locations.addAll(Utilities.getSignupMeetingsBean().getAllLocations()); - locations.add(0, new SelectItem(Utilities.rb.getString("select_location"))); + if(locations ==null){ + locations= new ArrayList(); + locations.addAll(Utilities.getSignupMeetingsBean().getAllLocations()); + locations.add(0, new SelectItem(Utilities.rb.getString("select_location"))); + } return locations; } @@ -639,10 +645,11 @@ * @return list of categories */ public List getAllCategories(){ - - List categories= new ArrayList(); - categories.addAll(Utilities.getSignupMeetingsBean().getAllCategories()); - categories.add(0, new SelectItem(Utilities.rb.getString("select_category"))); + if(categories == null){ + categories= new ArrayList(); + categories.addAll(Utilities.getSignupMeetingsBean().getAllCategories()); + categories.add(0, new SelectItem(Utilities.rb.getString("select_category"))); + } return categories; } Index: tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/EditMeetingSignupMBean.java =================================================================== --- tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/EditMeetingSignupMBean.java (revision 9546) +++ tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/EditMeetingSignupMBean.java (working copy) @@ -131,6 +131,9 @@ List allPossibleCoordinators; private boolean sendEmailByOwner; + + private List categories = null; + private List locations=null; /** * This method will reset everything to orignal value and also initialize @@ -216,6 +219,8 @@ this.selectedCategory = this.signupMeeting.getCategory(); this.customLocation=""; this.customCategory=""; + this.categories = null; + this.locations = null; /*pre-load all possible coordinators for step2*/ this.allPossibleCoordinators = this.sakaiFacade.getAllPossbileCoordinators(this.signupMeeting); @@ -755,10 +760,11 @@ * @return list of allLocations */ public List getAllLocations(){ - - List locations= new ArrayList(); - locations.addAll(Utilities.getSignupMeetingsBean().getAllLocations()); - locations.add(0, new SelectItem(Utilities.rb.getString("select_location"))); + if(locations ==null){ + locations= new ArrayList(); + locations.addAll(Utilities.getSignupMeetingsBean().getAllLocations()); + locations.add(0, new SelectItem(Utilities.rb.getString("select_location"))); + } return locations; } @@ -768,10 +774,11 @@ * @return list of categories */ public List getAllCategories(){ - - List categories= new ArrayList(); - categories.addAll(Utilities.getSignupMeetingsBean().getAllCategories()); - categories.add(0, new SelectItem(Utilities.rb.getString("select_category"))); + if(categories==null){ + categories= new ArrayList(); + categories.addAll(Utilities.getSignupMeetingsBean().getAllCategories()); + categories.add(0, new SelectItem(Utilities.rb.getString("select_category"))); + } return categories; }