Author: farra
Date: Mon Aug 31 08:27:18 2009
New Revision: 809497
URL: http://svn.apache.org/viewvc?rev=809497&view=rev
Log:
consite conferences extension updates:
- fixes for restful paths
- fixes for use of Rails TimeZones
- fix file_column for newer Rails
Modified:
labs/consite/trunk/conferences/app/controllers/admin/con/activities_controller.rb
labs/consite/trunk/conferences/app/controllers/admin/con/dashboard_controller.rb
labs/consite/trunk/conferences/app/controllers/admin/con/scheduled_sessions_controller.rb
labs/consite/trunk/conferences/app/models/activity.rb
labs/consite/trunk/conferences/app/models/scheduled_session.rb
labs/consite/trunk/conferences/app/views/admin/con/dashboard/index.html.erb
labs/consite/trunk/conferences/conferences_extension.rb
labs/consite/trunk/conferences/lib/conference_generator.rb
labs/consite/trunk/conferences/lib/session_tags.rb
labs/consite/trunk/conferences/vendor/plugins/file_column/lib/file_column_helper.rb
Modified:
labs/consite/trunk/conferences/app/controllers/admin/con/activities_controller.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/controllers/admin/con/activities_controller.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
---
labs/consite/trunk/conferences/app/controllers/admin/con/activities_controller.rb
(original)
+++
labs/consite/trunk/conferences/app/controllers/admin/con/activities_controller.rb
Mon Aug 31 08:27:18 2009
@@ -55,7 +55,7 @@
[:start_time, :end_time].each do |time|
# first convert from local to utc
- tz = TimeZone[ record.conference.time_zone ]
+ tz = ActiveSupport::TimeZone[ record.conference.time_zone ]
record[time] = tz.local_to_utc record[time]
end
end
Modified:
labs/consite/trunk/conferences/app/controllers/admin/con/dashboard_controller.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/controllers/admin/con/dashboard_controller.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
---
labs/consite/trunk/conferences/app/controllers/admin/con/dashboard_controller.rb
(original)
+++
labs/consite/trunk/conferences/app/controllers/admin/con/dashboard_controller.rb
Mon Aug 31 08:27:18 2009
@@ -21,8 +21,9 @@
end
def help
- if params[:con_id]
- @current_conference = Conference.find(params[:con_id])
+ @conferences = Conference.find(:all, :order => 'start_date')
+ if params[:id]
+ @current_conference = Conference.find(params[:id])
end
end
Modified:
labs/consite/trunk/conferences/app/controllers/admin/con/scheduled_sessions_controller.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/controllers/admin/con/scheduled_sessions_controller.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
---
labs/consite/trunk/conferences/app/controllers/admin/con/scheduled_sessions_controller.rb
(original)
+++
labs/consite/trunk/conferences/app/controllers/admin/con/scheduled_sessions_controller.rb
Mon Aug 31 08:27:18 2009
@@ -69,7 +69,7 @@
[:start_time, :end_time].each do |time|
# first convert from local to utc
- tz = TimeZone[ record.track.conference.time_zone ]
+ tz = ActiveSupport::TimeZone[ record.track.conference.time_zone ]
record[time] = tz.local_to_utc record[time]
end
end
Modified: labs/consite/trunk/conferences/app/models/activity.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/models/activity.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
--- labs/consite/trunk/conferences/app/models/activity.rb (original)
+++ labs/consite/trunk/conferences/app/models/activity.rb Mon Aug 31 08:27:18
2009
@@ -17,7 +17,7 @@
def start_time_local
if conference
- tz = TimeZone[conference.time_zone]
+ tz = ActiveSupport::TimeZone[conference.time_zone]
return tz.utc_to_local(start_time)
else
return start_time
@@ -26,7 +26,7 @@
def end_time_local
if conference
- tz = TimeZone[conference.time_zone]
+ tz = ActiveSupport::TimeZone[conference.time_zone]
return tz.utc_to_local(end_time)
else
return end_time
Modified: labs/consite/trunk/conferences/app/models/scheduled_session.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/app/models/scheduled_session.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
--- labs/consite/trunk/conferences/app/models/scheduled_session.rb (original)
+++ labs/consite/trunk/conferences/app/models/scheduled_session.rb Mon Aug 31
08:27:18 2009
@@ -65,7 +65,7 @@
def start_time_local
if track
- tz = TimeZone[track.conference.time_zone]
+ tz = ActiveSupport::TimeZone[track.conference.time_zone]
return tz.utc_to_local(start_time)
else
return start_time
@@ -74,7 +74,7 @@
def end_time_local
if track
- tz = TimeZone[track.conference.time_zone]
+ tz = ActiveSupport::TimeZone[track.conference.time_zone]
return tz.utc_to_local(end_time)
else
return end_time
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=809497&r1=809496&r2=809497&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 08:27:18 2009
@@ -64,7 +64,7 @@
</tr>
<tr class="level-0 no-children node">
- <td class="page"><%= link_to "Help", :action => 'help', :con_id => con_id
%></td>
+ <td class="page"><%= link_to "Help", :action => 'help', :id =>
@current_conference.id %></td>
<td class="">Instructions.</td>
</tr>
Modified: labs/consite/trunk/conferences/conferences_extension.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/conferences_extension.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
--- labs/consite/trunk/conferences/conferences_extension.rb (original)
+++ labs/consite/trunk/conferences/conferences_extension.rb Mon Aug 31 08:27:18
2009
@@ -36,8 +36,8 @@
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', :controller => 'admin/con/dashboard', :action =>
'index'
+ map.connect 'admin/con/dashboard/:action/:id', :controller =>
'admin/con/dashboard'
end
Modified: labs/consite/trunk/conferences/lib/conference_generator.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/lib/conference_generator.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
--- labs/consite/trunk/conferences/lib/conference_generator.rb (original)
+++ labs/consite/trunk/conferences/lib/conference_generator.rb Mon Aug 31
08:27:18 2009
@@ -2,7 +2,7 @@
attr_reader :con
def initialize(conference)
@con = conference
- @confs_root = @current_page = Page.find_by_url('/')
+ @confs_root = @current_page = Page.find_by_url('/c/')
end
def generate
Modified: labs/consite/trunk/conferences/lib/session_tags.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/lib/session_tags.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
--- labs/consite/trunk/conferences/lib/session_tags.rb (original)
+++ labs/consite/trunk/conferences/lib/session_tags.rb Mon Aug 31 08:27:18 2009
@@ -23,7 +23,7 @@
[:start_time, :end_time].each do | column |
tag "conference:sessions:#{column}" do |tag|
if tag.attr['datefmt']
- tz = TimeZone[tag.locals.conference.time_zone]
+ tz = ActiveSupport::TimeZone[tag.locals.conference.time_zone]
time = tz.utc_to_local tag.locals.session[column]
time.strftime(tag.attr['datefmt'])
else
@@ -83,7 +83,7 @@
[:start_time, :end_time].each do | column |
tag "conference:session:#{column}" do |tag|
time = tag.locals.scheduled_session[column]
- tz = TimeZone[tag.locals.conference.time_zone]
+ tz = ActiveSupport::TimeZone[tag.locals.conference.time_zone]
time = tz.utc_to_local time
if tag.attr['datefmt']
time.strftime(tag.attr['datefmt'])
Modified:
labs/consite/trunk/conferences/vendor/plugins/file_column/lib/file_column_helper.rb
URL:
http://svn.apache.org/viewvc/labs/consite/trunk/conferences/vendor/plugins/file_column/lib/file_column_helper.rb?rev=809497&r1=809496&r2=809497&view=diff
==============================================================================
---
labs/consite/trunk/conferences/vendor/plugins/file_column/lib/file_column_helper.rb
(original)
+++
labs/consite/trunk/conferences/vendor/plugins/file_column/lib/file_column_helper.rb
Mon Aug 31 08:27:18 2009
@@ -64,7 +64,7 @@
end
return unless url = object.send("#{method}_url", subdir)
- url.insert 0, request.relative_url_root.to_s.dup if absolute
+ url.insert 0, ActionController::Base.relative_url_root.to_s.dup if absolute
url
end
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
