Merge branch 'master' into polls

app/controllers/budgets/investments_controller.rb

@@ -55,7 +55,7 @@ module Budgets
     end
 
     def destroy
-      investment.destroy
+      @investment.destroy
       redirect_to user_path(current_user, filter: 'budget_investments'), notice: t('flash.actions.destroy.budget_investment')
     end
 

app/controllers/concerns/commentable_actions.rb

@@ -129,16 +129,16 @@ module CommentableActions
       when '4'
         1.year.ago
       else
-        Date.parse(params[:advanced_search][:date_min]) rescue nil
+        Date.parse(params[:advanced_search][:date_min]) rescue 100.years.ago
       end
     end
 
     def search_finish_date
-      params[:advanced_search][:date_max].try(:to_date) || Date.today
+      (params[:advanced_search][:date_max].to_date rescue Date.today) || Date.today
     end
 
     def search_date_range
-      search_start_date.beginning_of_day..search_finish_date.end_of_day
+      [100.years.ago, search_start_date].max.beginning_of_day..[search_finish_date, Date.today].min.end_of_day
     end
 
     def set_search_order

app/controllers/management/budgets_controller.rb

@@ -7,6 +7,11 @@ class Management::BudgetsController < Management::BaseController
 
   def create_investments
     @budgets = Budget.accepting.order(created_at: :desc).page(params[:page])
+
+    if current_manager_administrator?
+      @budgets += Budget.reviewing.order(created_at: :desc) +
+                  Budget.selecting.order(created_at: :desc)
+    end
   end
 
   def support_investments
@@ -23,4 +28,8 @@ class Management::BudgetsController < Management::BaseController
       check_verified_user t("management.budget_investments.alert.unverified_user")
     end
 
+    def current_manager_administrator?
+      session[:manager]["login"].match("admin")
+    end
+
 end

app/controllers/management/users_controller.rb

@@ -32,7 +32,7 @@ class Management::UsersController < Management::BaseController
   private
 
     def user_params
-      params.require(:user).permit(:document_type, :document_number, :username, :email)
+      params.require(:user).permit(:document_type, :document_number, :username, :email, :date_of_birth)
     end
 
     def destroy_session