From 8a7ae3f0611b22022ea5bbc1095c221fee6258ab Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Fri, 30 Nov 2012 15:17:29 +0800
Subject: [PATCH] correct user passwd and sent json to front-end

---
 app/views/devise/registrations/edit.html.erb | 20 ++++----------------
 config/initializers/devise.rb                |  1 -
 config/routes.rb                             |  5 ++++-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 4d74f8d8..b5968fca 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,26 +1,14 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" }) do |f| %>
-  <%= devise_error_messages! %>
+<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" }) do |f| %>
+  <div><%= f.submit "Update" %></div>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
-
-  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <div><%= f.label :password %>
   <%= f.password_field :password %></div>
 
   <div><%= f.label :password_confirmation %><br />
   <%= f.password_field :password_confirmation %></div>
 
-  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <div><%= f.label :current_password %>
   <%= f.password_field :current_password %></div>
 
-  <div><%= f.submit "Update" %></div>
 <% end %>
-
-<!--<h3>Cancel my account</h3>
-
- <p>Unhappy? <%#= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
-
-<%#= link_to "Back", :back %>
- -->
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index d316396c..1a997c5f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -110,7 +110,6 @@ Devise.setup do |config|
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  # config.scoped_views = true
 
   # Configure the default scope given to Warden. By default it's the first
   # devise role declared in your routes.
diff --git a/config/routes.rb b/config/routes.rb
index 94afbd40..9cf39f7f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,8 @@
 Orbit::Application.routes.draw do
-  devise_for :users
+  devise_for :users do
+    match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
+  end
+
   mount Resque::Server, :at => "/admin/resque"
 
   # routes for sinatra app