isoron/wikiufc
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Atualizando para o Rails 2.3.2

Browse Source
This commit is contained in:
Alinson S. Xavier
2009-07-16 11:55:04 -03:00
parent dcfc38eb09
commit 8e9b698944
71 changed files with 220 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/application.rb → app/controllers/application_controller.rb
View File

@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
include AuthenticationSystem
before_filter :startup
around_filter :set_timezone
before_filter :set_timezone
# Força o login para algumas áreas do sistema
before_filter :require_login, :only => [ :edit, :new, :create, :update, :delete, :destroy, :download ]
@@ -62,10 +62,8 @@ class ApplicationController < ActionController::Base
end
def set_timezone
#TzTime.zone = session[:user].tz
TzTime.zone = TZInfo::Timezone.get("America/Fortaleza")
yield
TzTime.reset!
#Time.zone = session[:user].tz
Time.zone = "America/Fortaleza"
end
def startup

2
app/controllers/attachments_controller.rb
View File

@@ -89,7 +89,7 @@ class AttachmentsController < ApplicationController
def undelete
@attachment = Attachment.find_with_deleted(params[:id])
@attachment.update_attribute(:deleted_at, nil)
@attachment.recover!
flash[:notice] = 'Attachment restored'[]
AttachmentRestoreLogEntry.create!(:target_id => @attachment.id, :user => @current_user, :course => @attachment.course)
redirect_to course_attachment_url(@attachment.course, @attachment)

3
app/controllers/courses_controller.rb
View File

@@ -31,7 +31,6 @@ class CoursesController < ApplicationController
@courses = Course.find(:all, :order => 'grade asc, full_name asc', :conditions => ['period = ?', @period])
end
respond_to do |format|
format.html
format.xml { render :xml => @courses }
@@ -54,7 +53,7 @@ class CoursesController < ApplicationController
respond_to do |format|
format.html { redirect_to course_path(@course) }
format.xml { head :created, :location => formatted_course_url(@course, :xml) }
format.xml { head :created, :location => course_url(@course, :format => :xml) }
end
end

8
app/controllers/events_controller.rb
View File

@@ -51,7 +51,7 @@ class EventsController < ApplicationController
respond_to do |format|
format.html { redirect_to course_event_path(@course, @event) }
format.xml { head :created, :location => formatted_course_event_url(@course, @event, :xml) }
format.xml { head :created, :location => course_event_url(@course, @event, :format => :xml) }
end
end
@@ -61,7 +61,7 @@ class EventsController < ApplicationController
def update
@event.attributes = params[:event]
dirty = @event.dirty?
dirty = @event.changed?
@event.save!
flash[:notice] = 'Event updated'[]
@@ -69,7 +69,7 @@ class EventsController < ApplicationController
respond_to do |format|
format.html { redirect_to course_event_path(@course, @event) }
format.xml { head :created, :location => formatted_course_event_url(@course, @event, :xml) }
format.xml { head :created, :location => course_event_url(@course, @event, :format => :xml) }
end
end
@@ -100,7 +100,7 @@ class EventsController < ApplicationController
def undelete
@event = Event.find_with_deleted(params[:id])
@event.restore!
@event.recover!
flash[:notice] = "Event restored"[]
EventRestoreLogEntry.create!(:target_id => @event.id, :user => @current_user, :course => @event.course, :version => @event.version)

20
app/controllers/news_controller.rb
View File

@@ -53,8 +53,8 @@ class NewsController < ApplicationController
NewsCreateLogEntry.create!(:target_id => @news.id, :user => @current_user, :course => @course, :version => @news.version)
respond_to do |format|
format.html { redirect_to course_news_path(@course, @news) }
format.xml { head :created, :location => formatted_course_news_url(@course, @news, :xml) }
format.html { redirect_to course_news_instance_path(@course, @news) }
format.xml { head :created, :location => course_news_instance_url(@course, @news, :format => :xml) }
end
end
@@ -65,40 +65,40 @@ class NewsController < ApplicationController
def update
@news.attributes = params[:news]
@news.timestamp = Time.now.utc
dirty = @news.dirty?
dirty = @news.changed?
@news.save!
flash[:notice] = 'News updated'[]
NewsEditLogEntry.create!(:target_id => @news.id, :user => @current_user, :course => @course, :version => @news.version) if dirty
respond_to do |format|
format.html { redirect_to course_news_path(@course, @news) }
format.xml { head :created, :location => formatted_course_news_url(@course, @news, :xml) }
format.html { redirect_to course_news_instance_path(@course, @news) }
format.xml { head :created, :location => course_news_instance_url(@course, @news, :format => :xml) }
end
end
def destroy
@news.destroy
flash[:notice] = 'News removed'[]
flash[:undo] = undelete_course_news_url(@course, @news)
flash[:undo] = undelete_course_news_instance_url(@course, @news)
NewsDeleteLogEntry.create!(:target_id => @news.id, :user => @current_user, :course => @course, :version => @news.version)
respond_to do |format|
format.html { redirect_to course_news_index_path(@course) }
format.html { redirect_to course_news_path(@course) }
format.xml { head :ok }
end
end
def undelete
@news = News.find_with_deleted(params[:id])
@news.restore!
@news.recover!
flash[:notice] = "News restored"[]
NewsRestoreLogEntry.create!(:target_id => @news.id, :user => @current_user, :course => @news.course, :version => @news.version)
respond_to do |format|
format.html { redirect_to course_news_url(@news.course, @news) }
format.html { redirect_to course_news_instance_url(@news.course, @news) }
end
end
@@ -113,6 +113,6 @@ class NewsController < ApplicationController
def cache_sweep
expire_fragment(course_path(@course.id, :part => :right))
expire_fragment(course_news_index_path(@course.id))
expire_fragment(course_news_path(@course.id))
end
end

25
app/controllers/wiki_controller.rb
View File

@@ -49,8 +49,8 @@ class WikiController < ApplicationController
WikiCreateLogEntry.create!(:target_id => @wiki_page.id, :user => @current_user, :course => @course)
respond_to do |format|
format.html { redirect_to course_wiki_path(@course, @wiki_page) }
format.xml { head :created, :location => formatted_course_wiki_url(@course, @wiki_page, :xml) }
format.html { redirect_to course_wiki_instance_url(@course, @wiki_page) }
format.xml { head :created, :location => course_wiki_instance_url(@course, @wiki_page, :format => :xml) }
end
end
@@ -73,7 +73,7 @@ class WikiController < ApplicationController
@wiki_page.attributes = params[:wiki_page]
@wiki_page.user_id = session[:user_id]
@wiki_page.course_id = @course.id
dirty = @wiki_page.dirty?
dirty = @wiki_page.changed?
@wiki_page.save!
WikiEditLogEntry.create!(:target_id => @wiki_page.id, :user => @current_user, :course => @course, :version => @wiki_page.version) if dirty
@@ -81,15 +81,15 @@ class WikiController < ApplicationController
flash[:notice] = "Wiki page updated"[]
respond_to do |format|
format.html { redirect_to course_wiki_path(@course, @wiki_page) }
format.xml { head :created, :location => formatted_course_wiki_url(@course, @wiki_page, :xml) }
format.html { redirect_to course_wiki_instance_url(@course, @wiki_page) }
format.xml { head :created, :location => course_wiki_instance_url(@course, @wiki_page, :format => :xml) }
end
end
def destroy
@wiki_page.destroy
flash[:notice] = "Wiki page removed"[]
flash[:undo] = url_for(:course_id => @course, :id => @wiki_page.id, :action => 'undelete')
flash[:undo] = undelete_course_wiki_instance_url(@course, @wiki_page.id)
WikiDeleteLogEntry.create!(:target_id => @wiki_page.id, :user => @current_user, :course => @course)
@@ -120,8 +120,9 @@ class WikiController < ApplicationController
end
def diff
@to = WikiPage.find_version(params[:id], params[:to])
@from = WikiPage.find_version(params[:id], params[:from])
@wiki_page = WikiPage.find(params[:id])
@to = @wiki_page.versions.find_by_version(params[:to])
@from = @wiki_page.versions.find_by_version(params[:from])
@diff = WikiPage.diff(@from, @to)
end
@@ -147,13 +148,13 @@ class WikiController < ApplicationController
def undelete
@wiki_page = WikiPage.find_with_deleted(params[:id])
@wiki_page.update_attribute(:deleted_at, nil)
@wiki_page.recover!
flash[:notice] = "Wiki page restored"[]
WikiRestoreLogEntry.create!(:target_id => @wiki_page.id, :user => @current_user, :course => @wiki_page.course)
respond_to do |format|
format.html { redirect_to course_wiki_url(@wiki_page.course, @wiki_page) }
format.html { redirect_to course_wiki_instance_url(@wiki_page.course, @wiki_page) }
end
end
@@ -167,7 +168,7 @@ class WikiController < ApplicationController
end
def cache_sweep
expire_fragment course_path(@course.id)
expire_fragment course_wiki_path(@course.id, @wiki_page.id)
expire_fragment course_url(@course.id)
expire_fragment course_wiki_instance_url(@course.id, @wiki_page.id)
end
end