gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #86 from ChrisBr/fix_eventtypes

Browse source 
Fix eventtypes form
This commit is contained in:
Artem Chernikov 2014-04-30 15:57:01 +02:00
commit 4e395a0d7a
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/admin/eventtype_controller.rb → app/controllers/admin/eventtypes_controller.rb
View file

@ -1,17 +1,17 @@
class Admin::EventtypeController < ApplicationController
class Admin::EventtypesController < ApplicationController
before_filter :verify_organizer
def show
render :eventtype_list
render :eventtypes
end
def update
@conference.update_attributes!(params[:conference])
redirect_to(admin_conference_eventtype_path(
redirect_to(admin_conference_eventtypes_path(
conference_id: @conference.short_title),
notice: 'Event types were successfully updated.')
rescue Exception => e
redirect_to(admin_conference_eventtype_path(
redirect_to(admin_conference_eventtypes_path(
conference_id: @conference.short_title),
alert: 'Event types update failed: #{e.message}')
end

4
app/views/admin/conference/_sidebar.html.haml
View file

@ -10,8 +10,8 @@
= link_to "Rooms", admin_conference_rooms_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_tracks_path(@conference.short_title))}
= link_to "Tracks", admin_conference_tracks_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_eventtype_index_path(@conference.short_title))}
= link_to "Event Types", admin_conference_eventtype_index_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_eventtypes_path(@conference.short_title))}
= link_to "Event Types", admin_conference_eventtypes_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_difficulty_levels_path(@conference.short_title))}
= link_to "Difficulty Levels", admin_conference_difficulty_levels_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_social_events_path(@conference.short_title))}

0
app/views/admin/eventtype/_event_type_fields.html.erb → app/views/admin/eventtypes/_event_type_fields.html.erb
View file

0
app/views/admin/eventtype/event_type_list.html.haml → app/views/admin/eventtypes/index.html.haml
View file

2
config/routes.rb
View file

@ -27,7 +27,7 @@ Osem::Application.routes.draw do
resources :difficulty_levels, only: [:show, :update, :index]
resources :rooms, only: [:show, :update, :index]
resources :tracks, only: [:show, :update, :index]
resources :eventtype, only: [:show, :update, :index]
resources :eventtypes, only: [:show, :update, :index]
resources :social_events, only: [:show, :update, :index]
resources :supporter_levels, only: [:show, :update, :index]
resources :emails, only: [:show, :update, :index]