style
This commit is contained in:
@@ -46,7 +46,8 @@ class BlogpostsController < ApplicationController
|
||||
def update
|
||||
@post = Blogpost.find(params[:id])
|
||||
if mod?
|
||||
if @post.update_attributes(params[:blogpost])
|
||||
@post.user_editor = current_user
|
||||
if @post.update_attributes(params[:blogpost] ? params[:blogpost].slice(:title, :content, :user_editor) : {})
|
||||
redirect_to @post, notice: 'Post has been updated.'
|
||||
else
|
||||
flash[:alert] = "There was a problem while updating the post"
|
||||
|
||||
@@ -22,13 +22,14 @@ class SessionsController < ApplicationController
|
||||
user.last_login = Time.now
|
||||
user.save
|
||||
if user.disabled?
|
||||
flash[:alert] = "This user has been disabled!"
|
||||
flash[:alert] = "Your account has been disabled!"
|
||||
redirect_to login_path
|
||||
elsif user.banned?
|
||||
flash[:alert] = "You are banned!"
|
||||
redirect_to user
|
||||
else
|
||||
session[:user_id] = user.id
|
||||
flash[:alert] = "Remember to validate your email! Your account might be deleted" if user.unconfirmed?
|
||||
redirect_to root_path, :notice => "Logged in!"
|
||||
end
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user