Commit 6fcfe12

authored

Merge pull request #311 from n-rodriguez/wip/rework_numeric

2 parents 3a9397a + a6a2d68 commit 6fcfe12Copy full SHA for 6fcfe12

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ and in your model:`
`423`	`423`
`424`	`424`	```ruby
`425`	`425`	`class OrderedTag < ActiveRecord::Base`
`426`		`- has_closure_tree order: 'sort_order'`
	`426`	`+ has_closure_tree order: 'sort_order', numeric_order: true`
`427`	`427`	`end`
`428`	`428`	```
`429`	`429`

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ def initialize(model_class, options)`
`22`	`22`	`:parent_column_name => 'parent_id',`
`23`	`23`	`:dependent => :nullify, # or :destroy or :delete_all -- see the README`
`24`	`24`	`:name_column => 'name',`
`25`		`- :with_advisory_lock => true`
	`25`	`+ :with_advisory_lock => true,`
	`26`	`+ :numeric_order => false`
`26`	`27`	`}.merge(options)`
`27`	`28`	`raise ArgumentError, "name_column can't be 'path'" if options[:name_column] == 'path'`
`28`	`29`	`if order_is_numeric?`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,7 @@ def order_option?`
`17`	`17`	`end`
`18`	`18`
`19`	`19`	`def order_is_numeric?`
`20`		`- # skip if database is not connected.`
`21`		`- return false unless ::ActiveRecord::Base.connected?`
`22`		`-`
`23`		`- # The table might not exist yet (in the case of ActiveRecord::Observer use, see issue 32)`
`24`		`- return false if !order_option? \|\| !model_class.table_exists?`
`25`		`- c = model_class.columns_hash[order_column]`
`26`		`- c && c.type == :integer`
	`20`	`+ options[:numeric_order]`
`27`	`21`	`end`
`28`	`22`
`29`	`23`	`def subclass?`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ class ContractType < ActiveRecord::Base`
`81`	`81`	`class Label < ActiveRecord::Base`
`82`	`82`	`# make sure order doesn't matter`
`83`	`83`	`acts_as_tree :order => :column_whereby_ordering_is_inferred, # <- symbol, and not "sort_order"`
	`84`	`+ :numeric_order => true,`
`84`	`85`	`:parent_column_name => "mother_id",`
`85`	`86`	`:dependent => :destroy`
`86`	`87`

Comments

(0)