rubocop fixing

This commit is contained in:
Aaro Koivukangas
2023-08-14 18:11:35 +03:00
parent da643b6614
commit 4e74c30afb
8 changed files with 37 additions and 38 deletions
+10 -9
View File
@@ -1,5 +1,5 @@
class BeerclubsController < ApplicationController
before_action :set_beerclub, only: %i[ show edit update destroy ]
before_action :set_beerclub, only: %i[show edit update destroy]
# GET /beerclubs or /beerclubs.json
def index
@@ -58,13 +58,14 @@ class BeerclubsController < ApplicationController
end
private
# Use callbacks to share common setup or constraints between actions.
def set_beerclub
@beerclub = Beerclub.find(params[:id])
end
# Only allow a list of trusted parameters through.
def beerclub_params
params.require(:beerclub).permit(:name, :founded, :city)
end
# Use callbacks to share common setup or constraints between actions.
def set_beerclub
@beerclub = Beerclub.find(params[:id])
end
# Only allow a list of trusted parameters through.
def beerclub_params
params.require(:beerclub).permit(:name, :founded, :city)
end
end
+10 -9
View File
@@ -1,5 +1,5 @@
class MembershipsController < ApplicationController
before_action :set_membership, only: %i[ show edit update destroy ]
before_action :set_membership, only: %i[show edit update destroy]
# GET /memberships or /memberships.json
def index
@@ -63,13 +63,14 @@ class MembershipsController < ApplicationController
end
private
# Use callbacks to share common setup or constraints between actions.
def set_membership
@membership = Membership.find(params[:id])
end
# Only allow a list of trusted parameters through.
def membership_params
params.require(:membership).permit(:user_id, :beerclub_id)
end
# Use callbacks to share common setup or constraints between actions.
def set_membership
@membership = Membership.find(params[:id])
end
# Only allow a list of trusted parameters through.
def membership_params
params.require(:membership).permit(:user_id, :beerclub_id)
end
end
+1 -1
View File
@@ -5,7 +5,7 @@ class SessionsController < ApplicationController
def create
user = User.find_by username: params[:username]
if user && user.authenticate(params[:password])
if user&.authenticate(params[:password])
session[:user_id] = user.id if user
redirect_to user_path user, notice: "Welcome back :)"
else
+2 -4
View File
@@ -17,9 +17,8 @@ class UsersController < ApplicationController
# GET /users/1/edit
def edit
if not @user == current_user
# redirect_to user_path(@user), notice: "Not permitted to edit user"
end
return if @user == current_user
# redirect_to user_path(@user), notice: "Not permitted to edit user"
end
# POST /users or /users.json
@@ -39,7 +38,6 @@ class UsersController < ApplicationController
# PATCH/PUT /users/1 or /users/1.json
def update
respond_to do |format|
if user_params[:username].nil? && @user == current_user && @user.update(user_params)
format.html { redirect_to user_url(@user), notice: "User was successfully updated." }