Author: farra
Date: Mon Aug 31 06:44:00 2009
New Revision: 809472
URL: http://svn.apache.org/viewvc?rev=809472&view=rev
Log:
Updating consite conferences extension to use restful paths/routes
Modified:
labs/consite/trunk/conferences/app/controllers/admin/con/current_conference_controller.rb
labs/consite/trunk/conferences/app/views/admin/con/dashboard/index.html.erb
labs/consite/trunk/conferences/app/views/layouts/conferences.html.haml
labs/consite/trunk/conferences/conferences_extension.rb
Modified:
labs/consite/trunk/conferences/app/controllers/admin/con/current_conference_controller.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/controllers/admin/con/current_conference_controller.rb?rev=809472&r1=809471&r2=809472&view=diff
==============================================================================
---
labs/consite/trunk/conferences/app/controllers/admin/con/current_conference_controller.rb
(original)
+++
labs/consite/trunk/conferences/app/controllers/admin/con/current_conference_controller.rb
Mon Aug 31 06:44:00 2009
@@ -4,11 +4,11 @@
before_filter :set_current_conference
def set_current_conference
- if params[:con_id]
- @current_conference = Conference.find(params[:con_id])
+ if params[:conference_id]
+ @current_conference = Conference.find(params[:conference_id])
#!! Rails 2.1 approach
- # Time.zone = @current_conference.time_zone if @current_conference
+ Time.zone = @current_conference.time_zone if @current_conference
end
end
Modified:
labs/consite/trunk/conferences/app/views/admin/con/dashboard/index.html.erb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/views/admin/con/dashboard/index.html.erb?rev=809472&r1=809471&r2=809472&view=diff
==============================================================================
--- labs/consite/trunk/conferences/app/views/admin/con/dashboard/index.html.erb
(original)
+++ labs/consite/trunk/conferences/app/views/admin/con/dashboard/index.html.erb
Mon Aug 31 06:44:00 2009
@@ -27,40 +27,39 @@
</tr>
</thead>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Conference Details", :controller =>
'admin/con/conferences',
- :action => 'edit', :_method => 'get', :con_id => con_id %></td>
+ <td class="page"><%= link_to "Conference Details",
edit_admin_con_conference_path(:id => @current_conference.id) %></td>
<td class="">Edit conference details such as dates, venue and short
description.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Tracks", :controller => 'admin/con/tracks',
:con_id => @current_conference.id %></td>
+ <td class="page"><%= link_to "Tracks",
admin_con_conference_tracks_path(:conference_id => @current_conference.id)
%></td>
<td class="">Define conference tracks. Tracks have a date and a location
at the venue.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Submissions", :controller =>
'admin/con/submissions', :con_id => @current_conference.id %></td>
+ <td class="page"><%= link_to "Submissions",
admin_con_conference_submissions_path(:conference_id => @current_conference.id)
%></td>
<td class="">Review all presentation submissions for this conference.</td>
</tr>
<!-- <tr class="level-0 no-children node">
- <td class="page"><%= link_to "Schedule", :controller =>
'admin/con/scheduled_sessions', :con_id => @current_conference.id %></td>
+ <td class="page"><%= link_to "Schedule",
admin_con_conference_scheduled_sessions_path(:conference_id =>
@current_conference.id) %></td>
<td class="">Manage the scheduled conference sessions.</td>
</tr>
-->
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Activities", :controller =>
'admin/con/activities', :con_id => @current_conference.id %></td>
+ <td class="page"><%= link_to "Activities",
admin_con_conference_activities_path(:conference_id => @current_conference.id)
%></td>
<td class="">Schedule special activities (breaks, BoFs, keynotes...).</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Speakers", :controller =>
'admin/con/conference_roles', :con_id => con_id %></td>
+ <td class="page"><%= link_to "Speakers",
admin_con_conference_speakers_path(:conference_id => @current_conference.id)
%></td>
<td class="">Manage speakers for this conference.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Sponsors", :controller =>
'admin/con/sponsors', :con_id => con_id %></td>
+ <td class="page"><%= link_to "Sponsors",
admin_con_conference_sponsors_path(:conference_id => @current_conference.id)
%></td>
<td class="">Manage conference sponsor list.</td>
</tr>
@@ -84,42 +83,42 @@
</tr>
</thead>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Venues", :controller => 'admin/con/venues'
%></td>
+ <td class="page"><%= link_to "Venues", admin_con_venues_path %></td>
<td class="">Edit venue addresses and room names.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Presentation Types", :controller =>
'admin/con/presentation_types' %></td>
+ <td class="page"><%= link_to "Presentation Types",
admin_con_presentation_types_path %></td>
<td class="">Define the types of sessions for any conference.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Sponsor Types", :controller =>
'admin/con/sponsor_types' %></td>
+ <td class="page"><%= link_to "Sponsor Types", admin_con_sponsor_types_path
%></td>
<td class="">Define the type of sponsors for any conference</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Sponsor Levels", :controller =>
'admin/con/sponsor_levels' %></td>
+ <td class="page"><%= link_to "Sponsor Levels",
admin_con_sponsor_levels_path %></td>
<td class="">Define the sponsor classes (i.e.- ranks) for any
conference</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "All User Accounts", :controller =>
'admin/con/users'%></td>
+ <td class="page"><%= link_to "All User Accounts", admin_con_users_path
%></td>
<td class="">Browse and manage all user accounts and speaker information
for all conferences.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "All Organizations", :controller =>
'admin/con/organizations'%></td>
+ <td class="page"><%= link_to "All Organizations",
admin_con_organizations_path %></td>
<td class="">Edit all sponsorship organizations.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "All Presentations", :controller =>
'admin/con/presentations'%></td>
+ <td class="page"><%= link_to "All Presentations",
admin_con_presentations_path %></td>
<td class="">Browse all presentations for any conference.</td>
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "All Conferences", :controller =>
'admin/con/conferences'%></td>
+ <td class="page"><%= link_to "All Conferences", admin_con_conferences_path
%></td>
<td class="">Browse all conferences.</td>
</tr>
Modified: labs/consite/trunk/conferences/app/views/layouts/conferences.html.haml
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/views/layouts/conferences.html.haml?rev=809472&r1=809471&r2=809472&view=diff
==============================================================================
--- labs/consite/trunk/conferences/app/views/layouts/conferences.html.haml
(original)
+++ labs/consite/trunk/conferences/app/views/layouts/conferences.html.haml Mon
Aug 31 06:44:00 2009
@@ -45,10 +45,10 @@
%p
= link_to image_tag('conferences/arrow_180.png', :alt =>
'Return to dashboard'), :controller => 'admin/con/dashboard', :action =>
'index', :id => @current_conference.id
- if @controller.controller_name =~
/conference_roles|submissions/
- = link_to image_tag('conferences/printer.png'), :action =>
'report', :con_id => params[:con_id]
- = link_to image_tag('conferences/report.png'), :action =>
'report', :format => 'csv', :con_id => params[:con_id]
+ = link_to image_tag('conferences/printer.png'),
report_admin_con_conference_submissions_path(:conference_id =>
@current_conference.id)
+ = link_to image_tag('conferences/report.png'),
report_admin_con_conference_submissions_path(:conference_id =>
@current_conference.id, :format => 'csv')
- if @controller.controller_name =~ /conference_roles/
- = link_to image_tag('conferences/email.png'), :action =>
'compose', :con_id => params[:con_id]
+ = link_to image_tag('conferences/email.png'),
compose_admin_con_conference_conference_roles_path(:conference_id =>
@currnet_confernece)
- if @current_conference
%h1= @current_conference.name
%h4
Modified: labs/consite/trunk/conferences/conferences_extension.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/conferences_extension.rb?rev=809472&r1=809471&r2=809472&view=diff
==============================================================================
--- labs/consite/trunk/conferences/conferences_extension.rb (original)
+++ labs/consite/trunk/conferences/conferences_extension.rb Mon Aug 31 06:44:00
2009
@@ -9,31 +9,36 @@
url "http://cubiclemuses.com/cm";
define_routes do |map|
- map.connect 'admin/con', :controller => 'admin/con/dashboard'
- map.connect 'admin/con/conferences/:action', :controller =>
'admin/con/conferences'
- map.connect 'admin/con/venues/:action', :controller => 'admin/con/venues'
- map.connect 'admin/con/locations/:action', :controller =>
'admin/con/locations'
- map.connect 'admin/con/organizations/:action', :controller =>
'admin/con/organizations'
- map.connect 'admin/con/sponsor_types/:action', :controller =>
'admin/con/sponsor_types'
- map.connect 'admin/con/sponsor_levels/:action', :controller =>
'admin/con/sponsor_levels'
- map.connect 'admin/con/presentation_types/:action', :controller =>
'admin/con/presentation_types'
- map.connect 'admin/con/session_types/:action', :controller =>
'admin/con/session_types'
- map.connect 'admin/con/users/:action', :controller => 'admin/con/users'
- map.connect 'admin/con/cfp/:action', :controller => 'admin/con/cfp'
- map.connect 'admin/con/presentations/:action', :controller =>
'admin/con/presentations'
+
+ map.namespace :admin, :member => { :remove => :get } do |admin|
+ admin.namespace :con do |con|
+ con.resources :conferences, :active_scaffold => true do |conferences|
+ conferences.resources :activities, :active_scaffold => true
+ conferences.resources :tracks, :active_scaffold => true
+ conferences.resources :conference_roles, :active_scaffold => true,
:collection => {:compose => :get, :email => :post, :report => :get}
+ conferences.resources :panel_members, :active_scaffold => true
+ conferences.resources :scheduled_sessions, :active_scaffold => true
+ conferences.resources :speakers, :active_scaffold => true
+ conferences.resources :sponsors, :active_scaffold => true
+ conferences.resources :submissions, :active_scaffold => true,
:collection => {:report => :get}
+ end
+ con.resources :sponsor_levels, :active_scaffold => true
+ con.resources :sponsor_types, :active_scaffold => true
+ con.resources :session_types, :active_scaffold => true
+ con.resources :presentation_types, :active_scaffold => true
+ con.resources :venues, :active_scaffold => true
+ con.resources :locations, :active_scaffold => true
+ con.resources :organizations, :active_scaffold => true
+ con.resources :presentations, :active_scaffold => true
+ con.resources :users, :active_scaffold => true
+ con.resources :cfp
+ end
+ end
+
+ map.connect 'admin/con', :controller => 'admin/con/dashboard'
map.connect 'admin/con/:con_id/dashboard/:action/:id', :controller =>
'admin/con/dashboard'
- map.connect 'admin/con/:con_id/activities/:action', :controller =>
'admin/con/activities'
- map.connect 'admin/con/:con_id/conference_roles/:action', :controller =>
'admin/con/conference_roles'
- map.connect 'admin/con/:con_id/conference_roles/:action.:format',
:controller => 'admin/con/conference_roles'
- map.connect 'admin/con/:con_id/panel_members/:action', :controller =>
'admin/con/panel_members'
- map.connect 'admin/con/:con_id/schedule/:action', :controller =>
'admin/con/schedule'
- map.connect 'admin/con/:con_id/scheduled_sessions/:action', :controller =>
'admin/con/scheduled_sessions'
- map.connect 'admin/con/:con_id/speakers/:action', :controller =>
'admin/con/speakers'
- map.connect 'admin/con/:con_id/sponsors/:action', :controller =>
'admin/con/sponsors'
- map.connect 'admin/con/:con_id/submissions/:action', :controller =>
'admin/con/submissions'
- map.connect 'admin/con/:con_id/submissions/:action.:format', :controller
=> 'admin/con/submissions'
- map.connect 'admin/con/:con_id/tracks/:action', :controller =>
'admin/con/tracks'
+
end
def activate
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
