gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove nil hash objects

Browse source
This commit is contained in:
nasia 2017-08-29 16:20:21 +03:00
parent 7cd1635317
commit 88a6b2769b
3 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/admin/sponsors_controller.rb
View file

@ -9,12 +9,15 @@ module Admin
end end
def show def show
@sponsor.swag.reject! { |_key, value| value[:type].blank? || value[:quantity].blank? }
@sponsor.swag_transportation.reject! { |_key, value| value[:carrier_name].blank? || value[:tracking_number].blank? || value[:boxes].blank? }
@sponsor.swag_index = @sponsor.swag.length @sponsor.swag_index = @sponsor.swag.length
@sponsor.carrier_index = @sponsor.swag_transportation.length @sponsor.carrier_index = @sponsor.swag_transportation.length
end end
def edit def edit
@sponsor.swag = @sponsor.swag @sponsor.swag.reject! { |_key, value| value[:type].blank? || value[:quantity].blank? }
@sponsor.swag_transportation.reject! { |_key, value| value[:carrier_name].blank? || value[:tracking_number].blank? }
@sponsor.swag_index = @sponsor.swag.length @sponsor.swag_index = @sponsor.swag.length
@sponsor.carrier_index = @sponsor.swag_transportation.length @sponsor.carrier_index = @sponsor.swag_transportation.length
end end

70
app/views/admin/sponsors/index.html.haml
View file

@ -92,13 +92,14 @@
- else - else
%span.fa.fa-times.text-danger %span.fa.fa-times.text-danger
%td %td
- if sponsor.has_swag - if sponsor.swag.length > 0
- sponsor.swag.each do |key, value| - sponsor.swag.each do |key, value|
= value[:type] - unless value[:type].blank?
( = value[:type]
= value[:quantity] (
) = value[:quantity]
%br )
%br
%td %td
= check_box_tag @conference.short_title, sponsor.id, sponsor.swag_received, = check_box_tag @conference.short_title, sponsor.id, sponsor.swag_received,
@ -163,7 +164,7 @@
= link_to 'Cancel', cancel_admin_conference_sponsor_path(@conference.short_title, sponsor.id), = link_to 'Cancel', cancel_admin_conference_sponsor_path(@conference.short_title, sponsor.id),
method: :patch, class: 'btn btn-mini btn-warning' method: :patch, class: 'btn btn-mini btn-warning'
#to_contact.tab-pane #to_contact.tab-pane
- if @conference.sponsors.to_contact.any? - if @conference.sponsors.any?
.row .row
.col-md-12 .col-md-12
%table.table.table-hover#sponsors %table.table.table-hover#sponsors
@ -175,33 +176,34 @@
%th Level %th Level
%th Actions %th Actions
%tbody %tbody
- @conference.sponsors.to_contact.each do |sponsor| - @conference.sponsors.each do |sponsor|
%tr - if sponsor.state =='to_contact'
%td %tr
= image_tag(sponsor.picture.thumb.url, width: '20%') %td
%td = image_tag(sponsor.picture.thumb.url, width: '20%')
= link_to sponsor.name, admin_conference_sponsor_path(@conference.short_title, sponsor) %td
%td = link_to sponsor.name, admin_conference_sponsor_path(@conference.short_title, sponsor)
= truncate(sponsor.description) %td
%td = truncate(sponsor.description)
= link_to sponsor.website_url, sponsor.website_url %td
%td = link_to sponsor.website_url, sponsor.website_url
= sponsor.sponsorship_level.title %td
%td = sponsor.sponsorship_level.title
.btn-group %td
= link_to 'Edit', edit_admin_conference_sponsor_path(@conference.short_title, sponsor), .btn-group
method: :get, class: 'btn btn-mini btn-primary' = link_to 'Edit', edit_admin_conference_sponsor_path(@conference.short_title, sponsor),
= link_to 'Delete', admin_conference_sponsor_path(@conference.short_title, sponsor), method: :get, class: 'btn btn-mini btn-primary'
method: :delete, class: 'btn btn-mini btn-danger', data: { confirm: "Do you really want to delete the sponsor #{sponsor.name}?" } = link_to 'Delete', admin_conference_sponsor_path(@conference.short_title, sponsor),
- if sponsor.transition_possible? :confirm method: :delete, class: 'btn btn-mini btn-danger', data: { confirm: "Do you really want to delete the sponsor #{sponsor.name}?" }
= link_to 'Confirm', confirm_admin_conference_sponsor_path(@conference.short_title, sponsor.id), - if sponsor.transition_possible? :confirm
method: :patch, class: 'btn btn-mini btn-success' = link_to 'Confirm', confirm_admin_conference_sponsor_path(@conference.short_title, sponsor.id),
- if sponsor.transition_possible? :contact method: :patch, class: 'btn btn-mini btn-success'
= link_to 'Contacted', contact_admin_conference_sponsor_path(@conference.short_title, sponsor.id), - if sponsor.transition_possible? :contact
method: :patch, class: 'btn btn-mini btn-default' = link_to 'Mark as Contacted', contact_admin_conference_sponsor_path(@conference.short_title, sponsor.id),
- if sponsor.transition_possible? :cancel method: :patch, class: 'btn btn-mini btn-default'
= link_to 'Cancel', cancel_admin_conference_sponsor_path(@conference.short_title, sponsor.id), - if sponsor.transition_possible? :cancel
method: :patch, class: 'btn btn-mini btn-warning' = link_to 'Cancel', cancel_admin_conference_sponsor_path(@conference.short_title, sponsor.id),
method: :patch, class: 'btn btn-mini btn-warning'
- else - else
%p There are no unconfirmed sponsors %p There are no unconfirmed sponsors

2
app/views/admin/sponsors/show.html.haml
View file

@ -74,7 +74,7 @@
off_text: 'No' } off_text: 'No' }
- if @sponsor.has_swag - if @sponsor.swag.length > 0
%tr %tr
%td.col-md-2 %td.col-md-2
%b Swag's Type %b Swag's Type