Skip to content
Browse files

removed passwords controller

  • Loading branch information...
1 parent 04722c2 commit 576cd04f5a3f98dda1d566181d180783eda93e6c @thiyagarajan committed Jun 23, 2012
View
175 .idea/workspace.xml
@@ -2,8 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8894bf14-d843-4e4c-9893-49f60c267f1f" name="Default" comment="">
+ <change type="DELETED" beforePath="D:\sampleprj\pols\app\assets\javascripts\passwords.js.coffee" afterPath="" />
+ <change type="DELETED" beforePath="D:\sampleprj\pols\app\controllers\passwords_controller.rb" afterPath="" />
+ <change type="DELETED" beforePath="D:\sampleprj\pols\app\helpers\passwords_helper.rb" afterPath="" />
+ <change type="DELETED" beforePath="D:\sampleprj\pols\app\views\passwords\edit.html.erb" afterPath="" />
+ <change type="DELETED" beforePath="D:\sampleprj\pols\test\functional\passwords_controller_test.rb" afterPath="" />
+ <change type="DELETED" beforePath="D:\sampleprj\pols\test\unit\helpers\passwords_helper_test.rb" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/home_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/home_controller.rb" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
</list>
<ignored path="pols.iws" />
<ignored path=".idea/workspace.xml" />
@@ -25,73 +31,10 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="home_controller.rb" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/controllers/home_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="78" selection-start="328" selection-end="328" vertical-scroll-proportion="0.27175844">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="development.log" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/log/development.log">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1926" column="0" selection-start="82920" selection-end="82920" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="index.html.erb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="11" column="10" selection-start="240" selection-end="240" vertical-scroll-proportion="-7.1923075">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="20120623052511_create_cms.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/migrate/20120623052511_create_cms.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="6" column="8" selection-start="153" selection-end="153" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="passwords_controller.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/controllers/passwords_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="8" column="24" selection-start="167" selection-end="167" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="routes.rb" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="routes.rb" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="registrations_controller.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/controllers/registrations_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="10" column="24" selection-start="353" selection-end="353" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="recaptcha.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/config/initializers/recaptcha.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="33" column="5" selection-start="809" selection-end="809" vertical-scroll-proportion="0.21269296">
<folding />
</state>
</provider>
@@ -119,13 +62,13 @@
<option value="$PROJECT_DIR$/app/views/layouts/application.html.erb" />
<option value="$PROJECT_DIR$/app/views/devise/registrations/new.html.erb" />
<option value="$PROJECT_DIR$/Gemfile" />
- <option value="$PROJECT_DIR$/log/development.log" />
<option value="$PROJECT_DIR$/db/migrate/20120623052511_create_cms.rb" />
- <option value="$PROJECT_DIR$/app/controllers/passwords_controller.rb" />
- <option value="$PROJECT_DIR$/config/routes.rb" />
<option value="$PROJECT_DIR$/app/controllers/registrations_controller.rb" />
<option value="$PROJECT_DIR$/app/controllers/home_controller.rb" />
<option value="$PROJECT_DIR$/app/views/home/index.html.erb" />
+ <option value="$PROJECT_DIR$/log/development.log" />
+ <option value="$PROJECT_DIR$/app/controllers/passwords_controller.rb" />
+ <option value="$PROJECT_DIR$/config/routes.rb" />
</list>
</option>
</component>
@@ -199,38 +142,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="config" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="pols" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="pols" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="config" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="initializers" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="pols" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="pols" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -252,28 +163,6 @@
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="home" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="pols" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="pols" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -577,16 +466,16 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33611533" sideWeight="0.0" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33611533" sideWeight="0.67105263" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32894737" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -653,11 +542,6 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/config/application.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="57" selection-start="629" selection-end="629" vertical-scroll-proportion="0.5964912">
@@ -686,13 +570,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/log/development.log">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1926" column="0" selection-start="82920" selection-end="82920" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/db/migrate/20120530182403_create_categories.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="38" selection-start="97" selection-end="118" vertical-scroll-proportion="0.060390763">
@@ -714,9 +591,9 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/passwords_controller.rb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="24" selection-start="167" selection-end="167" vertical-scroll-proportion="0.0">
+ <state line="4" column="109" selection-start="207" selection-end="222" vertical-scroll-proportion="0.123636365">
<folding />
</state>
</provider>
@@ -730,35 +607,35 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers/registrations_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="24" selection-start="353" selection-end="353" vertical-scroll-proportion="0.0">
+ <state line="10" column="24" selection-start="353" selection-end="353" vertical-scroll-proportion="0.2915952">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/config/routes.rb">
+ <entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb">
+ <entry file="file://$PROJECT_DIR$/log/development.log">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="109" selection-start="207" selection-end="222" vertical-scroll-proportion="0.123636365">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/home_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="10" selection-start="240" selection-end="240" vertical-scroll-proportion="-7.1923075">
+ <state line="7" column="28" selection-start="259" selection-end="259" vertical-scroll-proportion="0.20411664">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/home_controller.rb">
+ <entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="78" selection-start="328" selection-end="328" vertical-scroll-proportion="0.27175844">
+ <state line="33" column="5" selection-start="809" selection-end="809" vertical-scroll-proportion="0.21269296">
<folding />
</state>
</provider>
View
3 app/assets/javascripts/passwords.js.coffee
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
View
18 app/controllers/passwords_controller.rb
@@ -1,18 +0,0 @@
-class PasswordsController < ApplicationController
- before_filter :authenticate_user!
-
- def edit
- @user = current_user
- end
-
- def update
- @user = current_user
- # raise params.inspect
- if @user.update_with_password(params[:user])
- sign_in(@user, :bypass => true)
- redirect_to root_path, :notice => "Your Password has been updated!"
- else
- render :edit, :locals => {:resource => @user, :resource_name => "user"}
- end
- end
-end
View
2 app/helpers/passwords_helper.rb
@@ -1,2 +0,0 @@
-module PasswordsHelper
-end
View
16 app/views/passwords/edit.html.erb
@@ -1,16 +0,0 @@
-<%# raise resource.inspect %>
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
- <%#= devise_error_messages! %>
- <%= f.hidden_field :reset_password_token %>
-
- <p><%= f.label :current_password %><br />
- <%= f.password_field :current_password %></p>
-
- <p><%= f.label :password, "New password" %><br />
- <%= f.password_field :password %></p>
-
- <p><%= f.label :password_confirmation, "Confirm new password" %><br />
- <%= f.password_field :password_confirmation %></p>
-
- <p><%= f.submit "Change my password" %></p>
-<% end %>
View
15 config/routes.rb
@@ -1,14 +1,6 @@
Pols::Application.routes.draw do
- #get "categories/index"
- #
- #get "categories/new"
- #
- #get "categories/edit"
- #
- #get "categories/show"
- #
- #get "comments/new"
+ devise_for :users
resources :categories
resources :home
@@ -39,13 +31,8 @@
resources :profiles
end
- devise_for :users, :controllers => {:passwords => "passwords"} do
- end
-
devise_for :users, :controllers => { :invitations => 'users/invitations' }
- #resources :passwords
-
resources :comments
match 'contact' => 'contact#new', :as => 'contact', :via => :get
View
9 test/functional/passwords_controller_test.rb
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class PasswordsControllerTest < ActionController::TestCase
- test "should get edit" do
- get :edit
- assert_response :success
- end
-
-end
View
4 test/unit/helpers/passwords_helper_test.rb
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class PasswordsHelperTest < ActionView::TestCase
-end

0 comments on commit 576cd04

Please sign in to comment.
Something went wrong with that request. Please try again.