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

Refactoring

Browse Source
This commit is contained in:
Alinson S. Xavier
2015-09-05 23:58:22 -04:00
parent 5be138e890
commit 580098eaf1
8 changed files with 92 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@@ -24,7 +24,7 @@ require 'authentication.rb'
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
helper :all helper :all
# protect_from_forgery protect_from_forgery
include AuthenticationSystem include AuthenticationSystem
@@ -59,7 +59,8 @@ class ApplicationController < ActionController::Base
end end
end end
def show_not_found def show_not_found(exception)
fail Exception if Rails.env.production?
respond_to do |format| respond_to do |format|
format.html { render file: "#{Rails.root}/public/404.html", status: 404, layout: false } format.html { render file: "#{Rails.root}/public/404.html", status: 404, layout: false }
format.xml { head 404 } format.xml { head 404 }

160
app/controllers/attachments_controller.rb
View File

@@ -20,103 +20,93 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
class AttachmentsController < ApplicationController class AttachmentsController < ApplicationController
before_filter :find_attachment
def show
respond_to do |format|
format.html
format.xml { render xml: @attachment }
end
end
#verify :method => :post, :only => [ :destroy, :create, :update ], def new
# :redirect_to => { :controller => 'courses', :action => :show } end
#after_filter :cache_sweep, :only => [ :create, :update, :destroy ] def create
@attachment.course_id = @course.id
@attachment.path = params[:attachment][:path]
@attachment.front_page = params[:attachment][:front_page]
@attachment.description = params[:attachment][:description]
@attachment.file_name = "blank"
unless params[:attachment][:file].nil?
@attachment.file = params[:attachment][:file]
@attachment.file_name = params[:attachment][:file].original_filename
@attachment.content_type = params[:attachment][:file].content_type
end
@attachment.save!
before_filter :find_attachment AttachmentCreateLogEntry.create!(target_id: @attachment.id, user: @current_user, course: @course)
flash[:notice] = t(:attachment_created)
def show respond_to do |format|
respond_to do |format| format.html { redirect_to course_attachment_url(@course, @attachment) }
format.html format.xml { head :created, location: course_attachment_url(@course, @attachment, format: :xml) }
format.xml { render :xml => @attachment } end
end end
end
def new def edit
end end
def create def update
@attachment.course_id = @course.id @attachment.path = params[:attachment][:path]
@attachment.path = params[:attachment][:path] @attachment.front_page = params[:attachment][:front_page]
@attachment.front_page = params[:attachment][:front_page] @attachment.description = params[:attachment][:description]
@attachment.description = params[:attachment][:description] unless params[:attachment][:file].nil?
@attachment.file_name = "blank" @attachment.file = params[:attachment][:file]
unless params[:attachment][:file].nil? @attachment.file_name = params[:attachment][:file].original_filename
@attachment.file = params[:attachment][:file] @attachment.content_type = params[:attachment][:file].content_type
@attachment.file_name = params[:attachment][:file].original_filename end
@attachment.content_type = params[:attachment][:file].content_type changed = @attachment.changed?
end
@attachment.save!
AttachmentCreateLogEntry.create!(:target_id => @attachment.id, :user => @current_user, :course => @course) if changed
flash[:notice] = t(:attachment_created) @attachment.last_modified = Time.now.utc
@attachment.save!
AttachmentEditLogEntry.create!(target_id: @attachment.id, user: @current_user, course: @course)
flash[:notice] = t(:attachment_updated)
end
respond_to do |format| respond_to do |format|
format.html { redirect_to course_attachment_url(@course, @attachment) } format.html { redirect_to course_attachment_url(@course, @attachment) }
format.xml { head :created, :location => course_attachment_url(@course, @attachment, :format => :xml) } format.xml { head :created, location: course_attachment_url(@course, @attachment, format: :xml) }
end end
end end
def edit def destroy
end @attachment.destroy
flash[:notice] = t(:attachment_removed)
def update log = AttachmentDeleteLogEntry.create!(target_id: @attachment.id, user: @current_user, course: @course)
@attachment.path = params[:attachment][:path] flash[:undo] = undo_course_log_url(@course, log)
@attachment.front_page = params[:attachment][:front_page]
@attachment.description = params[:attachment][:description]
unless params[:attachment][:file].nil?
@attachment.file = params[:attachment][:file]
@attachment.file_name = params[:attachment][:file].original_filename
@attachment.content_type = params[:attachment][:file].content_type
end
changed = @attachment.changed?
if changed respond_to do |format|
@attachment.last_modified = Time.now.utc format.html { redirect_to course_url(@course) }
@attachment.save! format.xml { head :ok }
AttachmentEditLogEntry.create!(:target_id => @attachment.id, :user => @current_user, :course => @course) end
flash[:notice] = t(:attachment_updated) end
end
respond_to do |format| def download
format.html { redirect_to course_attachment_url(@course, @attachment) } send_file("#{Rails.root}/public/upload/#{@course.id}/#{@attachment.id}",
format.xml { head :created, :location => course_attachment_url(@course, @attachment, :format => :xml) } filename: @attachment.file_name,
end type: @attachment.content_type,
end disposition: 'inline',
streaming: 'true')
end
def destroy protected
@attachment.destroy
flash[:notice] = t(:attachment_removed)
log = AttachmentDeleteLogEntry.create!(:target_id => @attachment.id, :user => @current_user, :course => @course) def find_attachment
flash[:undo] = undo_course_log_url(@course, log) params[:course_id] = Course.find(:first, conditions: ['short_name = ?', params[:course_id]], order: 'period desc').id if !params[:course_id].is_numeric? && !Course.find_by_short_name(params[:course_id]).nil?
@course = Course.find(params[:course_id])
respond_to do |format| @attachment = params[:id] ? @course.attachments.find(params[:id]) : Attachment.new
format.html { redirect_to course_url(@course) } end
format.xml { head :ok }
end
end
def download
send_file("#{Rails.root}/public/upload/#{@course.id}/#{@attachment.id}",
:filename => @attachment.file_name,
:type => @attachment.content_type,
:disposition => 'inline',
:streaming => 'true')
end
protected
def find_attachment
params[:course_id] = Course.find(:first, :conditions => ['short_name = ?', params[:course_id]], :order => 'period desc').id if !params[:course_id].is_numeric? and !Course.find_by_short_name(params[:course_id]).nil?
@course = Course.find(params[:course_id])
@attachment = params[:id] ? @course.attachments.find(params[:id]) : Attachment.new
end
def cache_sweep
expire_fragment(course_path(@course.id))
end
end end

10
app/controllers/courses_controller.rb
View File

@@ -24,11 +24,9 @@ class CoursesController < ApplicationController
:destroy] :destroy]
before_filter :require_login, only: [:enroll, :unenroll] before_filter :require_login, only: [:enroll, :unenroll]
before_filter :find_course, except: [:index] before_filter :find_course, except: [:index]
# after_filter :cache_sweep, only: [ :create, :update, :destroy ]
def index def index
@period = params[:period] || App.current_period @period = params[:period].blank? ? App.current_period : params[:period]
@courses = Course.visible.where(period: @period)
respond_to do |format| respond_to do |format|
format.html format.html
@@ -115,10 +113,4 @@ class CoursesController < ApplicationController
def require_admin def require_admin
fail AccessDenied, 'only admins can modify courses' unless admin? fail AccessDenied, 'only admins can modify courses' unless admin?
end end
def cache_sweep
expire_fragment(course_path(@course.id, part: 'right'))
expire_fragment(course_path(@course.id))
expire_fragment(courses_path)
end
end end

8
app/controllers/wiki_controller.rb
View File

@@ -23,9 +23,6 @@ class WikiController < ApplicationController
# verify params: :text, only: :preview, redirect_to: { action: :show } # verify params: :text, only: :preview, redirect_to: { action: :show }
# verify params: [:from, :to], only: :diff, redirect_to: { action: :versions } # verify params: [:from, :to], only: :diff, redirect_to: { action: :versions }
# after_filter :cache_sweep, only: [ :create, :update, :destroy, :move_up,
# :move_down, :undelete ]
before_filter :find_wiki, except: [:preview] before_filter :find_wiki, except: [:preview]
before_filter :require_login, only: [:new, :create, :edit, :update, :destroy, before_filter :require_login, only: [:new, :create, :edit, :update, :destroy,
:move_up, :move_down] :move_up, :move_down]
@@ -169,9 +166,4 @@ class WikiController < ApplicationController
@wiki_page = WikiPage.new(params[:wiki_page]) @wiki_page = WikiPage.new(params[:wiki_page])
end end
end end
def cache_sweep
expire_fragment course_url(@course.id)
expire_fragment course_wiki_instance_url(@course.id, @wiki_page.id)
end
end end

3
app/models/course.rb
View File

@@ -88,7 +88,8 @@ class Course < ActiveRecord::Base
end end
def self.pluck_periods def self.pluck_periods
Course.uniq.pluck(:period).reject!(&:blank?).sort.reverse periods = Course.uniq.reorder('').pluck(:period).reject!(&:blank?) || []
periods.sort.reverse
end end
def self.from_param(param) def self.from_param(param)

10
app/models/user.rb
View File

@@ -25,7 +25,7 @@ class User < ActiveRecord::Base
acts_as_paranoid acts_as_paranoid
has_and_belongs_to_many :courses, order: 'full_name', has_and_belongs_to_many :courses, order: 'full_name',
conditions: "period = #{App.current_period}" conditions: "period = '#{App.current_period}'"
validates_length_of :login, within: 3..40 validates_length_of :login, within: 3..40
validates_length_of :name, within: 3..40 validates_length_of :name, within: 3..40
@@ -86,8 +86,12 @@ class User < ActiveRecord::Base
end end
def courses_not_enrolled(period) def courses_not_enrolled(period)
Course.all(conditions: ['period = ? and hidden = ? and id not in (?)', if courses.empty?
period, false, courses]) Course.visible.where(period: period)
else
Course.where('period = ? and hidden = ? and id not in (?)',
period, false, courses)
end
end end
protected protected

2
app/views/courses/index.html.haml
View File

@@ -17,6 +17,8 @@
.right .right
= action_icon('subtract', 'Desmatricular-se', unenroll_course_url(course)) = action_icon('subtract', 'Desmatricular-se', unenroll_course_url(course))
= link_to h(course.full_name), course_url(course) = link_to h(course.full_name), course_url(course)
- else
- @courses = Course.visible.where(period: @period)
-# cache(courses_path) do -# cache(courses_path) do
- old_grade = 0 - old_grade = 0

4
app/views/layouts/_base.html.haml
View File

@@ -66,9 +66,9 @@
#footer #footer
%p %p
%b Wiki %b Wiki
UFC UFC 1.1
%p %p
Desenvolvido em Ruby on Rails Powered by Ruby on Rails, PostgreSQL & Linux
%p %p
Distribuido livremente sob a Distribuido livremente sob a
%a{href: 'https://www.gnu.org/licenses/agpl-3.0.en.html'} %a{href: 'https://www.gnu.org/licenses/agpl-3.0.en.html'}