Fixes for the review made by @javierm
this commit will be merged with the others when the chages are accepted
This commit is contained in:
committed by
Javi Martín
parent
88f0f14eab
commit
d574657b77
@@ -27,8 +27,16 @@ class ApplicationController < ActionController::Base
|
||||
respond_to :html
|
||||
helper_method :current_budget
|
||||
|
||||
before_action :set_user_for_ckeditor_pictures
|
||||
|
||||
private
|
||||
|
||||
def set_user_for_ckeditor_pictures
|
||||
if request.path == '/ckeditor/pictures' && request.request_method == 'POST'
|
||||
params['user_id'] = current_user.id
|
||||
end
|
||||
end
|
||||
|
||||
def authenticate_http_basic
|
||||
authenticate_or_request_with_http_basic do |username, password|
|
||||
username == Rails.application.secrets.http_basic_username && password == Rails.application.secrets.http_basic_password
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
class Ckeditor::PicturesController < Ckeditor::ApplicationController
|
||||
|
||||
load_and_authorize_resource
|
||||
|
||||
def index
|
||||
@pictures = Ckeditor.picture_adapter.find_all(ckeditor_pictures_scope)
|
||||
@pictures = Ckeditor::Paginatable.new(@pictures).page(params[:page])
|
||||
@@ -10,7 +12,7 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
|
||||
end
|
||||
|
||||
def create
|
||||
@picture = Ckeditor.picture_model.new
|
||||
@picture = Ckeditor.picture_model.new(user_id: current_user.id)
|
||||
respond_with_asset(@picture)
|
||||
end
|
||||
|
||||
@@ -30,7 +32,7 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
|
||||
end
|
||||
|
||||
def authorize_resource
|
||||
model = (@picture || Ckeditor.picture_model)
|
||||
model = @picture || Ckeditor.picture_model
|
||||
@authorization_adapter.try(:authorize, params[:action], model)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user