github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,663 Commits 34 Branches 105 Tags
v2.3.5
Commit Graph

689 Commits

Author SHA1 Message Date
Will Read
88d2e4ca6f Allow explicit placement of hidden id element for nested models. 
[#3259 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-11-15 21:50:35 +01:00
Bryan Helmkamp
8073e47262 Silence warning: instance variable @explicit_view_paths not initialized 2009-11-09 17:23:55 -05:00
Travis Briggs
eb30c69544 Ensure number_to_human_size does not strip zeros from the end [#1763 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-10-17 13:37:46 +13:00
Michael Koziarski
80da8eb43d Merge the prerequisites for on-by-default XSS escaping into rails. 
This consists of:

* String#html_safe! a method to mark a string as 'safe'
* ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it
* Calls to String#html_safe! throughout the rails helpers
* a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB)

Note, this does *not* give you on-by-default XSS escaping in 2.3 applications.  To get that you'll need to install a plugin:

http://github.com/nzkoz/rails_xss
 2009-10-08 13:59:21 +13:00
John Trupiano
f489b3341c Introduce :almost keyword for distance_of_time_in_words. Make 1.75 days - 2 days return '2 days'. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3266 state:committed]
 2009-09-28 14:56:19 +13:00
Jay Pignata
b372b4c875 Enhancing distance_of_time_in_words to prefix year output with over and about depending upon how many months have elapsed 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3106 state:committed]
 2009-09-28 14:56:14 +13:00
Eloy Duran
cddd4746f9 Rewrote ActionView::TestCase. 
The test case now mimicks the template environment more closely, so it's
possible to use render, load helper dependencies.

This also fixes assert_select, and similar assertions. Because view tests
and helpers generally don't render full templates assert_select looks
first in rendered and then in output_buffer to find the rendered output.
 2009-09-25 15:51:27 +02:00
Andrew France
55bc0c76f8 Allow fields_for on a nested_attributes association to accept an explicit collection to be used. [#2648 state:resolved] 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-09-12 13:16:30 +02:00
Akira Matsuda
e46e67c71f I18n: use I18n for select helpers' prompt text 
[#2252 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-08-26 13:56:15 -07:00
Jeremy Kemper
3cd245b7fa Revert "I18n: use I18n for select helpers' prompt text" 
Broke CI.

[#2252 state:open]

This reverts commit d725ad39da.
 2009-08-26 12:12:04 -07:00
Akira Matsuda
d725ad39da I18n: use I18n for select helpers' prompt text 
[#2252 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-08-26 09:39:01 -07:00
codeape
9a42096e95 Introduce grouped_collection_select helper. 
[#1249 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-08-10 00:00:02 -07:00
José Valim
e972acc0d7 Allow radio buttons to work with booleans. 
[#2937 state:committed]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-08-09 22:15:35 -07:00
Max Lapshin
9e29c084eb Make sure link_to generates the form with the specified :href if any [#2254 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-08-10 01:00:07 +01:00
Matt Duncan
ba961250bd Fixed to_label_tag to accept id attribute without changing for attribute [#2660 status:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2009-08-09 23:56:06 +01:00
Jeremy Kemper
d44b5c6219 Fix that RedCloth shouldn't be required to run tests 2009-08-09 11:02:45 -07:00
rizwanreza
d1202cfeb2 Support passing Redcloth options via textilize helper [#2973 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-08-09 16:42:50 +01:00
Michael Koziarski
796b7c6ce6 Don't call additional methods on builders passed to the atom_feed helper. 
Additionally, actually test that the atom_feed helper works with :xml as an option.

[#1836 state:committed]
 2009-08-09 13:09:24 +12:00
Jarl Friis
1c855ad4e7 My suggestion to fix ticket 2401 [#2401 state:resolved] 
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
 2009-07-02 11:56:56 -07:00
Yehuda Katz + Carl Lerche
281c1a82de Fixes a number of tests that inexplicably didn't fail when we committed the original patch 2009-07-02 10:50:39 -07:00
Chris Mear
eb52dc3db7 Make text_area_tag escape contents by default. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-06-27 13:15:53 +12:00
Joshua Peek
a491b19502 Add :concat option to asset tag helpers to force concatenation. 
This is useful for working around IE's stylesheet limit.

  stylesheet_link_tag :all, :concat => true
 2009-06-15 10:23:55 -05:00
Andrew Kaspick
d3d4822262 allow absolute paths for the asset caches 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-06-11 16:33:01 +12:00
Stephen Anderson
cd14a4a00e Sanitized the id generated by text_area_tag helper method. text_area_tag('item[description]') should return: <textarea id="item_description" name="item[description]"></textarea> instead of: <textarea id="item[description]" name="item[description]"></textarea> The old id was causing HTML validation failures. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-06-09 20:36:37 +12:00
David Stevenson
898a8801ff Made label target radio button tags with values. Radio button now respects inherited :index options when generating id. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-06-09 20:29:02 +12:00
Han Kessels
4d7c597e84 fix for IE incompatibility of :disable_with in submit_tag 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-06-01 14:03:35 +12:00
rick
d052e9fb58 Add pluggable JSON backends with support for the JSON gem. 
Example: ActiveSupport::JSON.backend = "JSONGem"

All internal Rails JSON encoding is now handled by
ActiveSupport::JSON.encode().  Use of #to_json is not recommended, as it
may clash with other libraries that overwrite it.  However, you can
recover Rails specific functionality
if you really want to use #to_json.

    gem 'json'
    ActiveSupport::JSON.backend = "JSONGem"

    class ActiveRecord::Base
      alias to_json rails_to_json
    end
 2009-05-17 18:40:38 -07:00
José Valim
66ead4f148 Allow strings to be sent as collection to select. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2391 state:committed]
 2009-05-15 15:30:42 +12:00
thedarkone
6a1267a0b1 Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-03-24 10:53:24 -05:00
Eugene Pimenov
bdfa733d04 Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-10 16:52:21 +00:00
rpheath
1ab2ff58ed Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-09 12:53:44 +00:00
Jeremy Kemper
1c36172c13 Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. 
[#1617 state:resolved]
 2009-03-08 13:11:58 -07:00
Yury Kotlyarov
9b8cde41bc Remove duplicate test [#2136 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-08 15:50:38 +00:00
Joshua Peek
ea8488caef Fixed simplified render with nested models [#2042 state:resolved] 2009-03-07 14:05:18 -06:00
Lawrence Pit
77f7d98e38 submit_tag with confirmation and disable_with [#660 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-03-07 13:29:35 -06:00
Dan Barry
45494580d9 Ensure Active Record error related view helpers escape the message [#1280 state:resolved] [Inge Jørgensen, Dan Barry] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-07 18:55:19 +00:00
Mike Gunderloy
dcd9c7f58e Fix spelling in test name. 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-02-28 15:35:03 +00:00
Eloy Duran
3d1d422b8b Pass a custom form builder on to nested fields_for calls. [#2023 status:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2009-02-27 13:56:27 +01:00
thedarkone
85df4841dd Template without a known template handler should only be reachable through its exact path. [#2027 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-24 10:41:45 -06:00
Joshua Peek
f8ea9f85d4 Fix templates reloading in development when using custom view path [#2012 state:resolved] 2009-02-19 20:55:56 -06:00
Tekin Suleyman
1525f3816e Enhanced form option helpers to add support for disabled option tags and use of anonymous functions for specifying selected and disabled values from collections. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-02-14 14:51:35 +13:00
Tekin Suleyman
d206b80a36 DRY up form option helper tests 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-02-14 14:51:35 +13:00
Sam Oliver
f04346d8b9 Stops date select helpers from defaulting the selected date to today if :prompt option has been used 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#561 state:resolved]
 2009-02-13 22:04:27 +13:00
Lance Ivy
5dbc9d40a4 Changed API of NestedAttributes to take an array, or hash with index keys, of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
[#1892 state:committed]
 2009-02-13 21:47:56 +13:00
thedarkone
3942cb406e Port fast reloadable templates from rails-dev-boost. 2009-02-12 13:04:12 -06:00
Joshua Peek
f400209084 Move checkbox hidden field before the actual checkbox so the actual value doesn't get clobbered [#1863 state:resolved] 2009-02-10 13:10:46 -06:00
Andrew White
199e750d46 Fix some edge cases when the same template is called with different local assigns 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-10 12:09:49 -06:00
David Heinemeier Hansson
7527cdf79c Added partial scoping to TranslationHelper#translate, so if you call translate('.foo') from the people/index.html.erb template, you'll actually be calling I18n.translate(people.index.foo) [DHH] 2009-02-10 12:57:12 +01:00
Andrew White
893e9eb995 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-09 14:20:30 -06:00
José Valim
50f51ff950 Render implicit html template when xhr request now supports localization [#1886 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-07 11:37:02 -06:00