From 4843021971784e12b964607c2681f295560e2faf Mon Sep 17 00:00:00 2001 From: nasia Date: Wed, 23 Aug 2017 23:08:58 +0300 Subject: [PATCH] multiple swags [wip] --- .rubocop_todo.yml | 1 + app/controllers/admin/sponsors_controller.rb | 21 +++++++++++-------- app/views/admin/sponsors/_edit_form.html.haml | 5 ++--- app/views/admin/sponsors/_swags.erb | 7 +++++++ 4 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 app/views/admin/sponsors/_swags.erb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a91f2ae9..6d74b5ff 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -585,6 +585,7 @@ Style/PredicateName: - 'spec/**/*' - 'app/models/comment.rb' - 'app/models/contact.rb' + - 'app/controllers/admin/sponsors_controller' # Offense count: 1 # Cop supports --auto-correct. diff --git a/app/controllers/admin/sponsors_controller.rb b/app/controllers/admin/sponsors_controller.rb index af367250..1c2147dc 100644 --- a/app/controllers/admin/sponsors_controller.rb +++ b/app/controllers/admin/sponsors_controller.rb @@ -12,8 +12,7 @@ module Admin def show; end - def edit - end + def edit; end def new @sponsor = @conference.sponsors.new @@ -52,8 +51,12 @@ module Admin end end + def add_swag + swags_hash = @sponsor.swags_hash + end + def generate_swags_hash(type, quantity) - swags_hash = Hash.new + swags_hash = {} swags_hash[type.to_s] = quantity.to_i end @@ -62,27 +65,27 @@ module Admin def paid @sponsor.paid = !@sponsor.paid if @sponsor.save - flash[:notice] = "Sponsor successfully updated." + flash[:notice] = 'Sponsor successfully updated.' else - flash[:error] = "Sponsor failed to be updated." + flash[:error] = 'Sponsor failed to be updated.' end end def has_swag @sponsor.has_swag = !@sponsor.has_swag if @sponsor.save - flash[:notice] = "Sponsor successfully updated." + flash[:notice] = 'Sponsor successfully updated.' else - flash[:error] = "Sponsor failed to be updated." + flash[:error] = 'Sponsor failed to be updated.' end end def swag_received @sponsor.swag_received = !@sponsor.swag_received if @sponsor.save - flash[:notice] = "Sponsor successfully updated." + flash[:notice] = 'Sponsor successfully updated.' else - flash[:error] = "Sponsor failed to be updated." + flash[:error] = 'Sponsor failed to be updated.' end end diff --git a/app/views/admin/sponsors/_edit_form.html.haml b/app/views/admin/sponsors/_edit_form.html.haml index 98513372..d55fe311 100644 --- a/app/views/admin/sponsors/_edit_form.html.haml +++ b/app/views/admin/sponsors/_edit_form.html.haml @@ -20,9 +20,8 @@ off_color: 'warning', on_text: 'Yes', off_text: 'No' } - = f.input :type, label: 'Swags type' - = f.input :quantity, label: 'Swags quantity', as: :number, in: 0..9999 - - generate_swags_hash(@type, @quantity) + + = image_tag f.object.picture.thumb.url if f.object.picture? = f.input :picture %p.text-right diff --git a/app/views/admin/sponsors/_swags.erb b/app/views/admin/sponsors/_swags.erb new file mode 100644 index 00000000..ef3ac6a1 --- /dev/null +++ b/app/views/admin/sponsors/_swags.erb @@ -0,0 +1,7 @@ +
+ <%= f.inputs do %> + <%= f.input :type, label: 'Swags type' %> + <%= f.input :quantity, label: 'Swags quantity', as: :number, in: 0..9999 %> + <%- generate_swags_hash(@type, @quantity) %> + <% end %> +