Skip to content

Commit

Permalink
modified: Gemfile
Browse files Browse the repository at this point in the history
	modified:   admin/applicants.rb
	modified:   admin/events.rb
  • Loading branch information
marcometz committed Mar 12, 2013
1 parent d9fa18a commit 8463f19
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -9,7 +9,7 @@ gemspec
gem 'activeadmin', :git => "git://github.com/ikusei/active_admin.git", :require => "activeadmin"
gem 'goldencobra', :git => 'ssh://git@git.ikusei.de:7999/GC/basis-modul.git'
gem 'goldencobra_email_templates', :git => "git://github.com/ikusei/goldencobra_email_templates.git"
gem 'acts-as-taggable-on', git: 'git://github.com/mbleigh/acts-as-taggable-on.git'
gem 'acts-as-taggable-on', :git => 'git://github.com/mbleigh/acts-as-taggable-on.git'
gem 'compass-rails'
gem 'coffee-rails'
gem 'sass'
Expand Down
3 changes: 3 additions & 0 deletions admin/applicants.rb
Expand Up @@ -30,6 +30,9 @@
column :email, :sortable => :email do |applicant|
span applicant.email, class: 'email'
end
column "Event" do |applicant|
applicant.event_pricegroup.event.title if applicant.event_pricegroup && applicant.event_pricegroup.event
end
column 'Ticket' do |applicant|
link_to(applicant.event_registrations.first.ticket_number, "/system/tickets/ticket_#{applicant.event_registrations.first.ticket_number}.pdf", target: 'blank') if applicant.event_registrations.count > 0 && applicant.event_registrations.first.ticket_number.present?
end
Expand Down
2 changes: 1 addition & 1 deletion admin/events.rb
Expand Up @@ -6,7 +6,7 @@
scope "Alle", :scoped, :default => true
scope "Aktiv", :active
scope "Inaktiv", :inactive

filter :title
filter :start_date
filter :end_date
Expand Down

0 comments on commit 8463f19

Please sign in to comment.