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

Add paper_trail

Browse source
This commit is contained in:
nasia 2017-07-17 12:00:06 +03:00 • committed by Stella Rouzi
parent f7c0b64eb5
commit d9b2ebfc36
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/booth.rb
View file

@ -1,5 +1,6 @@
class Booth < ActiveRecord::Base class Booth < ActiveRecord::Base
include ActiveRecord::Transitions include ActiveRecord::Transitions
has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
belongs_to :conference belongs_to :conference
has_many :booth_requests, dependent: :destroy has_many :booth_requests, dependent: :destroy

4
app/views/admin/booths/_form.html.haml
View file

@ -11,8 +11,8 @@
= f.input :reasoning, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true, = f.input :reasoning, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true,
label: 'How it fits the conference' label: 'How it fits the conference'
= f.input :submitter_relationship, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true, = f.input :submitter_relationship, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true,
label: 'Your personal relationship with the organization you are applying for', label: 'Submitter\'s relation',
hint: 'e.g. employee, member of the open source community etc' hint: 'e.g. employee, comunity manager, etc'
= f.input :website_url = f.input :website_url
= responsibles_selector_input f = responsibles_selector_input f
= image_tag f.object.picture.thumb.url if f.object.picture? = image_tag f.object.picture.thumb.url if f.object.picture?

3
app/views/admin/booths/index.html.haml
View file

@ -33,7 +33,8 @@
%td %td
= booth.id = booth.id
%td %td
= image_tag(booth.picture.thumb.url, width: '20%') - if booth.logo_link
= image_tag(booth.picture.thumb.url, width: '20%')
%td %td
= link_to booth.title, admin_conference_booth_path(@conference.short_title, booth) = link_to booth.title, admin_conference_booth_path(@conference.short_title, booth)
%td %td

6
app/views/admin/versions/_object_desc_and_link.html.haml
View file

@ -80,6 +80,12 @@
= link_if_alive version, 'contact details', = link_if_alive version, 'contact details',
edit_admin_conference_contact_path(conference_id: Conference.find(version.conference_id).short_title) edit_admin_conference_contact_path(conference_id: Conference.find(version.conference_id).short_title)
- when 'Booth'
= 'booth'
- booth = current_or_last_object_state(version.item_type, version.item_id)
= link_if_alive version, booth.title,
admin_conference_booth_path(conference_id: Conference.find(version.conference_id).short_title, id: version.item_id )
- when 'Program' - when 'Program'
= link_if_alive version, 'program', = link_if_alive version, 'program',
admin_conference_program_path(conference_id: Conference.find(version.conference_id).short_title) admin_conference_program_path(conference_id: Conference.find(version.conference_id).short_title)