Permalink
Browse files

Fixed a pattern for module loading

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@137 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 8eec674 commit 65a9011ea3577f19055d653ff6bb16a62ae1a9dd @dhh dhh committed Dec 12, 2004
Showing with 5 additions and 2 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +3 −2 railties/lib/webrick_server.rb
View
2 activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*CVS*
+* Added the possibility of marking fields as being in error without adding a message (using nil) to it that'll get displayed wth full_messages #208 [mjobin]
+
* Fixed Base.errors to be indifferent as to whether strings or symbols are used. Examples:
Before:
View
5 railties/lib/webrick_server.rb
@@ -130,12 +130,13 @@ def self.parse_uri(path)
{ :controller => $1, :action => "index" }
when %r{^/#{component}/#{component}$} then
{ :controller => $1, :action => $2 }
+ when %r{^/#{component}/#{component}/#{id}$} then
+ { :controller => $1, :action => $2, :id => $3 }
+
when %r{^/#{component}/#{component}/$} then
{ :module => $1, :controller => $2, :action => "index" }
when %r{^/#{component}/#{component}/#{component}$} then
{ :module => $1, :controller => $2, :action => $3 }
- when %r{^/#{component}/#{component}/#{id}$} then
- { :controller => $1, :action => $2, :id => $3 }
when %r{^/#{component}/#{component}/#{component}/#{id}$} then
{ :module => $1, :controller => $2, :action => $3, :id => $4 }
else

0 comments on commit 65a9011

Please sign in to comment.