Merge branch 'start_url'

This commit is contained in:
Emi Matchu 2012-06-05 12:44:20 -04:00
commit be159bfecc
3 changed files with 15 additions and 0 deletions

View file

@ -14,6 +14,10 @@ class ApplicationController < ActionController::Base
def can_use_image_mode? def can_use_image_mode?
true true
end end
def not_found(record_name='record')
raise ActionController::RoutingError.new("#{record_name} not found")
end
class AccessDenied < StandardError;end class AccessDenied < StandardError;end

View file

@ -69,6 +69,16 @@ class OutfitsController < ApplicationController
format.json { render :json => @outfit } format.json { render :json => @outfit }
end end
end end
def start
@species = Species.find_by_name params[:species_name]
@color = Color.find_by_name params[:color_name]
if @species && @color
redirect_to wardrobe_path(:species => @species.id, :color => @color.id)
else
not_found('species/color')
end
end
def update def update
if @outfit.update_attributes(params[:outfit]) if @outfit.update_attributes(params[:outfit])

View file

@ -74,6 +74,7 @@ OpenneoImpressItems::Application.routes.draw do |map|
match 'users/top_contributors' => redirect('/users/top-contributors') match 'users/top_contributors' => redirect('/users/top-contributors')
match '/wardrobe' => 'outfits#edit', :as => :wardrobe match '/wardrobe' => 'outfits#edit', :as => :wardrobe
match '/start/:color_name/:species_name' => 'outfits#start'
match '/donate' => 'static#donate', :as => :donate match '/donate' => 'static#donate', :as => :donate
match 'image-mode' => 'static#image_mode', :as => :image_mode match 'image-mode' => 'static#image_mode', :as => :image_mode