[#3952] Pre select all projects, users, and activities.

Author: edavis10

app/controllers/timesheet_controller.rb

@@ -20,7 +20,6 @@ def index
     load_filters_from_session
     unless @timesheet
       @timesheet ||= Timesheet.new
-      @timesheet.users = [] # Clear users so they aren't selected
     end
     @timesheet.allowed_projects = allowed_projects
 

app/helpers/timesheet_helper.rb

@@ -46,21 +46,28 @@ def displayed_time_entries_for_issue(time_entries)
   end
 
   def project_options(timesheet)
-    options_from_collection_for_select(timesheet.allowed_projects,
+    available_projects = timesheet.allowed_projects
+    selected_projects = timesheet.projects.collect(&:id)
+    selected_projects = available_projects.collect(&:id) if selected_projects.blank?
+    
+    options_from_collection_for_select(available_projects,
                                        :id,
                                        :name,
-                                       timesheet.projects.collect(&:id))
+                                       selected_projects)
   end
 
   def activity_options(timesheet, activities)
     options_from_collection_for_select(activities, :id, :name, timesheet.activities)
   end
 
   def user_options(timesheet)
-    options_from_collection_for_select(Timesheet.viewable_users.sort { |a,b| a.to_s.downcase <=> b.to_s.downcase },
+    available_users = Timesheet.viewable_users.sort { |a,b| a.to_s.downcase <=> b.to_s.downcase }
+    selected_users = timesheet.users
+
+    options_from_collection_for_select(available_users,
                                        :id,
                                        :name,
-                                       timesheet.users)
+                                       selected_users)
 
   end
 end