app/controllers/symphonia/users_controller.rb in symphonia-2.2.1 vs app/controllers/symphonia/users_controller.rb in symphonia-3.0.0
- old
+ new
@@ -23,16 +23,16 @@
key :description, 'user response'
schema do
key :'$ref', :User
end
end
- # response :default do
- # key :description, 'unexpected error'
- # schema do
- # key :'$ref', :ErrorModel
- # end
- # end
+ # response :default do
+ # key :description, 'unexpected error'
+ # schema do
+ # key :'$ref', :ErrorModel
+ # end
+ # end
end
end
helper Symphonia::RendererHelper
@@ -47,11 +47,11 @@
respond_to do |format|
format.html do
@entities = @entities.page(params[:page])
render layout: !request.xhr?
end
- format.json { render json: @entities.all, only: %i[id]+Symphonia::User.registered_attributes.keys }
+ format.json { render json: @entities.all, only: %i[id] + Symphonia::User.registered_attributes.keys }
end
end
def show
@user = Symphonia::User.find(params[:id]) if params[:id]
@@ -103,11 +103,11 @@
respond_to do |format|
@user.edited_by = current_user
@user.edited_at = DateTime.now
if @user.save
format.html { redirect_back_or_default user_path(@user), notice: t(:text_updated) }
- format.any(:json ,:xml) { head :no_content }
+ format.any(:json, :xml) { head :no_content }
else
format.html do
@roles = Symphonia::Role.all
render action: 'edit'
end
@@ -120,11 +120,11 @@
def destroy
@user.destroy
respond_to do |format|
format.html { redirect_to params[:back_url] || users_url }
- format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@user)}')"}
+ format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@user)}')" }
format.json { head :no_content }
end
end
def archive
@@ -150,10 +150,10 @@
def find_user
@user = Symphonia::User.find(params[:id])
end
def authorize
- if User.current.id == @user.try!(:id)
+ if User.current.logged_in? && User.current.id == @user&.id
true
else
super
end
end
\ No newline at end of file