Skip to content
This repository has been archived by the owner on Apr 9, 2019. It is now read-only.

Commit

Permalink
single password logins now working correctly. add basic scaffold for …
Browse files Browse the repository at this point in the history
…amin/settings controller
  • Loading branch information
timriley committed Jun 24, 2008
1 parent a86c05a commit ed1e7bd
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 3 deletions.
6 changes: 4 additions & 2 deletions app/controllers/admin/logins_controller.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,10 +1,12 @@
class Admin::LoginsController < ApplicationController class Admin::LoginsController < Admin::AdminController
skip_before_filter :login_required, :only => [:new, :create]

def new def new
end end


def create def create
if Settings.instance.crypted_password?(params[:password]) if Settings.instance.crypted_password?(params[:password])
session[:logged_in] == true session[:logged_in] = true
redirect_back_or_default('/') redirect_back_or_default('/')
flash[:notice] = "Logged in successfully" flash[:notice] = "Logged in successfully"
else else
Expand Down
9 changes: 9 additions & 0 deletions app/controllers/admin/settings_controller.rb
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,9 @@
class Admin::SettingsController < Admin::AdminController
def edit
@settings = Settings.instance
end

def update
@settings = Settings.instance
end
end
2 changes: 1 addition & 1 deletion app/helpers/admin/logins_helper.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,2 +1,2 @@
module LoginsHelper module Admin::LoginsHelper
end end
2 changes: 2 additions & 0 deletions app/helpers/admin/settings_helper.rb
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,2 @@
module Admin::SettingsHelper
end
10 changes: 10 additions & 0 deletions app/views/admin/logins/new.haml
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,10 @@
%p= flash[:notice]

- form_tag admin_login_path do
#login
%p
%label{:for => 'password'} Password
%br
= password_field_tag :password
%p.button
= submit_tag 'Log in'
1 change: 1 addition & 0 deletions app/views/admin/settings/edit.haml
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1 @@
hey there
7 changes: 7 additions & 0 deletions config/routes.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,11 @@
ActionController::Routing::Routes.draw do |map| ActionController::Routing::Routes.draw do |map|
map.resources :photos map.resources :photos
map.root :controller => 'photos', :action => 'show' map.root :controller => 'photos', :action => 'show'

map.namespace :admin do |admin|
admin.resource :settings
admin.resource :login
admin.logout '/logout', :controller => 'logins', :action => 'destroy'
admin.root :controller => 'settings', :action => 'edit'
end
end end
10 changes: 10 additions & 0 deletions spec/controllers/admin/settings_controller_spec.rb
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,10 @@
require File.dirname(__FILE__) + '/../../spec_helper'

describe Admin::SettingsController do

#Delete this example and add some real ones
it "should use Admin::SettingsController" do
controller.should be_an_instance_of(Admin::SettingsController)
end

end
11 changes: 11 additions & 0 deletions spec/helpers/admin/settings_helper_spec.rb
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,11 @@
require File.dirname(__FILE__) + '/../../spec_helper'

describe Admin::SettingsHelper do

#Delete this example and add some real ones or delete this file
it "should include the Admin::SettingsHelper" do
included_modules = self.metaclass.send :included_modules
included_modules.should include(Admin::SettingsHelper)
end

end

0 comments on commit ed1e7bd

Please sign in to comment.