From dccb9c75d8c6d7e8f2fe639db3fa8660b18d2681 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Fri, 13 Dec 2013 18:40:15 +0800 Subject: [PATCH] Page Parts now working --- .../admin/page_parts_controller.rb | 2 +- app/controllers/passwords_controller.rb | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 app/controllers/passwords_controller.rb diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb index 74377fa1..1950eb65 100644 --- a/app/controllers/admin/page_parts_controller.rb +++ b/app/controllers/admin/page_parts_controller.rb @@ -104,7 +104,7 @@ class Admin::PagePartsController < OrbitBackendController def update @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 - params[:page_part][:category] ||= params[:page][:category] + # params[:page_part][:category] ||= params[:page][:category] if if @part.update_attributes(params[:page_part]) set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu') flash.now[:notice] = t('update.success.content') diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb new file mode 100644 index 00000000..e17aa891 --- /dev/null +++ b/app/controllers/passwords_controller.rb @@ -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 \ No newline at end of file