Merge branch 'master' into redux-polling

app/controllers/admin/banners_controller.rb

@@ -2,7 +2,6 @@ class Admin::BannersController < Admin::BaseController
 
   has_filters %w{all with_active with_inactive}, only: :index
 
-  before_action :find_banner, only: [:edit, :update, :destroy]
   before_action :banner_styles, only: [:edit, :new, :create, :update]
   before_action :banner_imgs, only: [:edit, :new, :create, :update]
 
@@ -24,7 +23,6 @@ class Admin::BannersController < Admin::BaseController
   end
 
   def update
-    @banner.assign_attributes(banner_params)
     if @banner.update(banner_params)
       redirect_to admin_banners_path
     else
@@ -38,14 +36,11 @@ class Admin::BannersController < Admin::BaseController
   end
 
   private
+
     def banner_params
       params.require(:banner).permit(:title, :description, :target_url, :style, :image, :post_started_at, :post_ended_at)
     end
 
-    def find_banner
-      @banner = Banner.find(params[:id])
-    end
-
     def banner_styles
       @banner_styles = Setting.all.banner_style.map { |banner_style| [banner_style.value, banner_style.key.split('.')[1]] }
     end
@@ -53,4 +48,5 @@ class Admin::BannersController < Admin::BaseController
     def banner_imgs
       @banner_imgs = Setting.all.banner_img.map { |banner_img| [banner_img.value, banner_img.key.split('.')[1]] }
     end
+
 end

app/controllers/admin/comments_controller.rb

@@ -20,8 +20,9 @@ class Admin::CommentsController < Admin::BaseController
   end
 
   private
+
     def load_comment
       @comment = Comment.with_hidden.find(params[:id])
     end
 
-end
+end

app/controllers/admin/dashboard_controller.rb

@@ -3,4 +3,4 @@ class Admin::DashboardController < Admin::BaseController
   def index
   end
 
-end
+end

app/controllers/admin/debates_controller.rb

@@ -29,4 +29,4 @@ class Admin::DebatesController < Admin::BaseController
       @debate = Debate.with_hidden.find(params[:id])
     end
 
-end
+end

app/controllers/admin/geozones_controller.rb

@@ -0,0 +1,49 @@
+class Admin::GeozonesController < Admin::BaseController
+
+  respond_to :html
+
+  load_and_authorize_resource
+
+  def index
+    @geozones = Geozone.all.order("LOWER(name)")
+  end
+
+  def new
+  end
+
+  def edit
+  end
+
+  def create
+    @geozone = Geozone.new(geozone_params)
+
+    if @geozone.save
+      redirect_to admin_geozones_path
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @geozone.update(geozone_params)
+      redirect_to admin_geozones_path
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    if @geozone.safe_to_destroy?
+      @geozone.destroy
+      redirect_to admin_geozones_path, notice: t('admin.geozones.delete.success')
+    else
+      redirect_to admin_geozones_path, flash: { error: t('admin.geozones.delete.error') }
+    end
+  end
+
+  private
+
+    def geozone_params
+      params.require(:geozone).permit(:name, :external_code, :census_code, :html_map_coordinates)
+    end
+end

app/controllers/admin/officials_controller.rb

@@ -25,8 +25,9 @@ class Admin::OfficialsController < Admin::BaseController
   end
 
   private
+
     def user_params
       params.require(:user).permit(:official_position, :official_level)
     end
 
-end
+end

app/controllers/admin/organizations_controller.rb

@@ -27,4 +27,4 @@ class Admin::OrganizationsController < Admin::BaseController
     redirect_to request.query_parameters.merge(action: :index)
   end
 
-end
+end

app/controllers/admin/proposals_controller.rb

@@ -25,4 +25,4 @@ class Admin::ProposalsController < Admin::BaseController
       @proposal = Proposal.with_hidden.find(params[:id])
     end
 
-end
+end

app/controllers/admin/settings_controller.rb

@@ -15,7 +15,9 @@ class Admin::SettingsController < Admin::BaseController
   end
 
   private
+
     def settings_params
       params.require(:setting).permit(:value)
     end
+
 end

app/controllers/admin/signature_sheets_controller.rb

@@ -0,0 +1,32 @@
+class Admin::SignatureSheetsController < Admin::BaseController
+
+  def index
+    @signature_sheets = SignatureSheet.all
+  end
+
+  def new
+    @signature_sheet = SignatureSheet.new
+  end
+
+  def create
+    @signature_sheet = SignatureSheet.new(signature_sheet_params)
+    @signature_sheet.author = current_user
+    if @signature_sheet.save
+      @signature_sheet.delay.verify_signatures
+      redirect_to [:admin, @signature_sheet], notice: I18n.t('flash.actions.create.signature_sheet')
+    else
+      render :new
+    end
+  end
+
+  def show
+    @signature_sheet = SignatureSheet.find(params[:id])
+  end
+
+  private
+
+    def signature_sheet_params
+      params.require(:signature_sheet).permit(:signable_type, :signable_id, :document_numbers)
+    end
+
+end

app/controllers/admin/spending_proposals_controller.rb

@@ -54,4 +54,4 @@ class Admin::SpendingProposalsController < Admin::BaseController
       @tags = ActsAsTaggableOn::Tag.spending_proposal_tags
     end
 
-end
+end

app/controllers/admin/stats_controller.rb

@@ -32,4 +32,5 @@ class Admin::StatsController < Admin::BaseController
     @direct_messages = DirectMessage.count
     @users_who_have_sent_message = DirectMessage.select(:sender_id).distinct.count
   end
-end
+
+end

app/controllers/admin/users_controller.rb

@@ -30,4 +30,4 @@ class Admin::UsersController < Admin::BaseController
       @user = User.with_hidden.find(params[:id])
     end
 
-end
+end

app/controllers/admin/valuators_controller.rb

@@ -30,8 +30,10 @@ class Admin::ValuatorsController < Admin::BaseController
   end
 
   private
+
     def create_params
       params[:valuator][:description] = nil if params[:valuator][:description].blank?
       params.require(:valuator).permit(:user_id, :description)
     end
-end
+
+end