Page Parts now working
This commit is contained in:
parent
eb638995f0
commit
dccb9c75d8
|
@ -104,7 +104,7 @@ class Admin::PagePartsController < OrbitBackendController
|
||||||
def update
|
def update
|
||||||
@part = PagePart.find(params[:id])
|
@part = PagePart.find(params[:id])
|
||||||
# Sometimes category is passed into params[:page], so this line makes sure it will also be in params[:page_part] too
|
# Sometimes category is passed into params[:page], so this line makes sure it will also be in params[:page_part] too
|
||||||
params[:page_part][:category] ||= params[:page][:category]
|
# params[:page_part][:category] ||= params[:page][:category] if
|
||||||
if @part.update_attributes(params[:page_part])
|
if @part.update_attributes(params[:page_part])
|
||||||
set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
|
set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
|
||||||
flash.now[:notice] = t('update.success.content')
|
flash.now[:notice] = t('update.success.content')
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
class PasswordsController < Devise::PasswordsController
|
||||||
|
prepend_before_filter :require_no_authentication
|
||||||
|
include Devise::Controllers::InternalHelpers
|
||||||
|
|
||||||
|
# GET /resource/password/new
|
||||||
|
def new
|
||||||
|
build_resource({})
|
||||||
|
render_with_scope :new
|
||||||
|
end
|
||||||
|
|
||||||
|
# POST /resource/password
|
||||||
|
def create
|
||||||
|
self.resource = resource_class.send_reset_password_instructions(params[resource_name])
|
||||||
|
|
||||||
|
if successfully_sent?(resource)
|
||||||
|
respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
|
||||||
|
else
|
||||||
|
respond_with_navigational(resource){ render_with_scope :new }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# GET /resource/password/edit?reset_password_token=abcdef
|
||||||
|
def edit
|
||||||
|
self.resource = resource_class.new
|
||||||
|
resource.reset_password_token = params[:reset_password_token]
|
||||||
|
render_with_scope :edit
|
||||||
|
end
|
||||||
|
|
||||||
|
# PUT /resource/password
|
||||||
|
def update
|
||||||
|
self.resource = resource_class.reset_password_by_token(params[resource_name])
|
||||||
|
|
||||||
|
if resource.errors.empty?
|
||||||
|
flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
|
||||||
|
set_flash_message(:notice, flash_message) if is_navigational_format?
|
||||||
|
sign_in(resource_name, resource)
|
||||||
|
respond_with resource, :location => after_sign_in_path_for(resource)
|
||||||
|
else
|
||||||
|
respond_with_navigational(resource){ render_with_scope :edit }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
protected
|
||||||
|
|
||||||
|
# The path used after sending reset password instructions
|
||||||
|
def after_sending_reset_password_instructions_path_for(resource_name)
|
||||||
|
new_session_path(resource_name)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
Loading…
Reference in New Issue