Commit Graph

358 Commits

Author SHA1 Message Date
Jeremy Kemper
c140e80fc4 More robust relative url root discovery for SCGI compatibility. This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint. References #3070.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3237 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-12-08 04:40:24 +00:00
Marcel Molina
c3612a23e6 Silence deprecation warnings for keep_flash when running tests.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-12-02 00:39:25 +00:00
Marcel Molina
139e2c4aad Change form_for and fields_for method signatures to take object name and object as separate arguments rather than as a Hash.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3201 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-12-02 00:37:33 +00:00
Jeremy Kemper
d933627044 Introduce :selected option to the select helper. Allows you to specify a selection other than the current value of object.method. Specify :selected => nil to leave all options unselected. Closes #2991.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3174 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-23 21:59:20 +00:00
Sam Stephenson
bea737eb5a Make ActionController's render honor the :locals option when rendering a :file. Closes #1665.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-22 08:37:04 +00:00
Sam Stephenson
f212c88315 Pass multiple arguments to Element.show and Element.hide in JavaScriptGenerator instead of using iterators
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3116 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-21 01:54:36 +00:00
Jeremy Kemper
cd8686b456 r3173@asus: jeremy | 2005-11-18 23:34:41 -0800
Ticket 2731 - sessions
 r3185@asus:  jeremy | 2005-11-19 18:02:51 -0800
 eliminate const redefinition warning
 r3186@asus:  jeremy | 2005-11-19 19:25:50 -0800
 Use :database option instead of :dbfile
 r3187@asus:  jeremy | 2005-11-19 19:34:31 -0800
 Data writer assigns to instance var.  Since nothing is calling write_attribute on the data column except for marshal_data, simplify data reader to lazy-unmarshal the data column (no worrying whether it's already unmarshaled)
 r3188@asus:  jeremy | 2005-11-19 19:35:40 -0800
 Explicitly create the session class so that subsequent requests for the session can find it in the database.  This is masking a problem with the controller losing its @session instance var and therefore requesting a new session.
 r3189@asus:  jeremy | 2005-11-19 19:36:40 -0800
 Using create unnecessarily  broadens the existing duck-typing so use new + save instead.
 r3194@asus:  jeremy | 2005-11-19 20:28:17 -0800
 Test creation of another instance while first instance is still active.  Should return same session_id.
 r3195@asus:  jeremy | 2005-11-19 20:39:45 -0800
 Always create new AR sessions rather than trying too hard to avoid database traffic.  References #2731.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3100 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-20 04:41:59 +00:00
Sam Stephenson
b3c65bc849 Use Element.update('id', 'html') instead of uid=501(sam) gid=501(sam) groups=501(sam), 81(appserveradm), 79(appserverusr), 80(admin).innerHTML = 'html' in JavaScriptGenerator#replace_html so that script tags are evaluated
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3086 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-18 18:03:45 +00:00
Marcel Molina
62fe5bbfb1 Make rjs templates always implicitly skip out on layouts.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-18 08:32:17 +00:00
Jeremy Kemper
fb3fc46cdd Correct length for the truncate text helper. Closes #2913.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3080 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-18 01:25:39 +00:00
Marcel Molina
06e74b6c91 Add support for new rjs templates which wrap an update_page block.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-17 21:28:59 +00:00
Jeremy Kemper
8da9d02e6e Include QUOTED_TYPE constant in ActionPack AR assertions tests.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3059 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-16 09:09:04 +00:00
Jeremy Kemper
745ea39926 MemCache store may be given multiple addresses. Closes #2869.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3054 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-16 08:35:31 +00:00
Jeremy Kemper
08fd13d17c Handle cookie parsing irregularity for certain Nokia phones. Closes #2530.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3039 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-15 07:51:09 +00:00
Sam Stephenson
d99ed9bd6a Refactored JavaScriptHelper into PrototypeHelper and ScriptaculousHelper. Added PrototypeHelper::JavaScriptGenerator and PrototypeHelper#update_page for easily modifying multiple elements in an Ajax response.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3036 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-14 22:28:47 +00:00
David Heinemeier Hansson
947cec29d5 Added FormHelper#form_for and FormHelper#fields_for that makes it easier to work with forms for single objects also if they don't reside in instance variables [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3003 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-13 11:13:11 +00:00
Jeremy Kemper
b81c46e6bd options_for_select allows any objects which respond_to? :first and :last rather than restricting to Array and Range. Closes #2824. References [2126].
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2977 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-10 22:08:20 +00:00
Jeremy Kemper
adba181060 The auto_link text helper accepts an optional block to format the link text for each url and email address. References #2628.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2963 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-10 06:04:50 +00:00
Jeremy Kemper
0abaf3a2d8 CGI::Session::ActiveRecordStore.data_column_name = 'foobar' to use a different session data column than the 'data' default. References #2731. Remove error-prone method_missing passthrough to session model. Cleanup.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2944 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-09 01:03:24 +00:00
Jeremy Kemper
85baf07be8 Controllers with acronyms in their names (e.g. PDFController) require the correct default helper (PDFHelper in file pdf_helper.rb). Closes #2262. Do not raise an exception when default helper is missing; log a debug message instead. It's nice to delete empty helpers.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2938 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-08 08:23:13 +00:00
David Heinemeier Hansson
a6106e4ec6 Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [DHH] Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2873 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-04 19:42:22 +00:00
David Heinemeier Hansson
4f754985d0 Added redirect_to :back as a short-hand for redirect_to(request.env["HTTP_REFERER"])
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2848 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-02 14:47:03 +00:00
Thomas Fuchs
d47f3bcbad Change javascript_include_tag :defaults to not use script.aculo.us loader, which facilitates the use of plugins for future script.aculo.us and third party javascript extensions, and provide register_javascript_include_default for plugins to specify additional JavaScript files to load. Removed scriptaculous.js, slider.js and builder.js
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2835 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-11-01 06:34:40 +00:00
Scott Barron
025949102e Fix problem where redirecting components can cause an
infinite loop [Rick Olson]

Closes #2654


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-30 13:13:02 +00:00
Thomas Fuchs
56ae4ab547 Added support for the queue option on visual_effect
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-29 15:01:39 +00:00
David Heinemeier Hansson
cb0e27cee9 Fix that render :text didn't interpolate instance variables (Closes #2629, #2626) [skaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-28 07:33:54 +00:00
David Heinemeier Hansson
4e9bc0f02d Added TextHelper#strip_tags for removing HTML tags from a string (using HTMLTokenizer) (closes #2229) [marcin@junkheap.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2750 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-26 13:26:04 +00:00
David Heinemeier Hansson
07c494ae24 Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] ||= 'New if not set' (closes #2422) [Caio Chassot]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2747 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-26 13:14:10 +00:00
Nicholas Seckar
86a571090c Reset template variables after using render_to_string. Closes #2559
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-25 02:15:08 +00:00
Jeremy Kemper
22d9bad8a0 Expose the session model backing CGI::Session
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2696 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-20 21:59:48 +00:00
Jamis Buck
e515ba9ecd Fix the html-scanner to count children correctly, playing nicely with :only, fixes #2181 [patrick@lenz.sh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-18 00:50:52 +00:00
Nicholas Seckar
cb8bb70aa7 Make string-keys locals assigns optional
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2665 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-17 15:51:07 +00:00
David Heinemeier Hansson
8d9ee72a78 Fixed more Windows tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2659 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-16 22:08:11 +00:00
Tobias Lütke
0279949b05 added assert_valid to AP
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2635 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-16 02:20:53 +00:00
Nicholas Seckar
e625d27633 Add temporary support for passing locals to render using string keys
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-16 00:04:33 +00:00
Marcel Molina
48fd667bda Raise an exception if an attempt is made to insert more session data into the ActiveRecordStore data column than the column can hold. Closes #2234.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2612 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-15 14:39:29 +00:00
Scott Barron
f8f4eccd9a If a component redirects when called with render_component_as_string, render the
redirected to action.

Fixes #2327


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2604 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-15 02:53:21 +00:00
Nicholas Seckar
e0e8f0a302 Fix Request#host_with_port to use the standard port when Rails is behind a proxy.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-15 01:00:25 +00:00
Michael Koziarski
59709d9188 Ensure radio_button works as expected with values other than strings.
Thanks to:
*  grant.mcinnes@utoronto.ca
*  rails@jeffcole.net



git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2573 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-14 02:07:51 +00:00
Jeremy Kemper
acb80e3d0e Escape query strings in the href attribute of URLs created by url_helper. #2333
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2572 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 22:44:45 +00:00
David Heinemeier Hansson
43b6a74fb1 Added :locals support for render :inline #2463 [mdabney@cavoksolutions.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2567 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 20:26:39 +00:00
Jeremy Kemper
9a7ff1433a r3575@sedna: jeremy | 2005-10-13 11:22:13 -0700
Eliminate warning for redefined MemCache constant.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2554 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 19:05:41 +00:00
Sam Stephenson
4b72a4b12f Unset the X-Requested-With header when using the xhr wrapper in functional tests. Closes #2352.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2551 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 18:09:27 +00:00
Tobias Lütke
f60f76eab0 modified javascript_helper testcase to back up #2097
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-13 17:39:14 +00:00
Sam Stephenson
f49dc37e71 Wrap javascript_tag contents in a CDATA section and add a cdata_section method to TagHelper. Closes #1691.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2543 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-12 22:47:39 +00:00
Jamis Buck
8946804b8a Make xyz_tag(..., :id => "foo") work again
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2535 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-12 01:05:29 +00:00
Marcel Molina
064842f516 Convert boolean form options form the tag_helper. Recloses #809.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2523 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-10 21:34:51 +00:00
Sam Stephenson
0886bb391d Fixed that an instance variable with the same name as a partial should be implicitly passed as the partial :object. Closes #2269.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2522 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-10 20:35:13 +00:00
Marcel Molina
a9de9c48c2 Make assert_tag :children count appropriately. Closes #2181.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2500 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-09 01:45:21 +00:00
Thomas Fuchs
e7afaf62bd Added new scriptaculous options for auto_complete_field #2343 [m.stienstra@fngtps.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2431 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2005-10-01 05:43:53 +00:00