Revision 442:753f1380d6bc vendor/plugins/awesome_nested_set/lib

View differences:

vendor/plugins/awesome_nested_set/lib/.svn/all-wcprops
1 1
K 25
2 2
svn:wc:ra_dav:version-url
3
V 62
4
/svn/!svn/ver/4735/trunk/vendor/plugins/awesome_nested_set/lib
3
V 76
4
/svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/awesome_nested_set/lib
5 5
END
6 6
awesome_nested_set.rb
7 7
K 25
8 8
svn:wc:ra_dav:version-url
9
V 84
10
/svn/!svn/ver/4735/trunk/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
9
V 98
10
/svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
11 11
END
vendor/plugins/awesome_nested_set/lib/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/vendor/plugins/awesome_nested_set/lib
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/awesome_nested_set/lib
6 6
http://redmine.rubyforge.org/svn
7 7

  
8 8

  
9 9

  
10
2011-01-22T11:46:15.415880Z
11
4735
10
2011-04-12T16:31:00.547886Z
11
5441
12 12
jplang
13 13

  
14 14

  
......
32 32

  
33 33

  
34 34

  
35
2011-03-03T11:05:12.000000Z
36
30e0732ab58f6380af97e08261871486
37
2011-01-22T11:46:15.415880Z
38
4735
35
2011-06-06T13:20:52.000000Z
36
1930a187dbd0635d534b5afb1a9957ba
37
2011-04-12T16:31:00.547886Z
38
5441
39 39
jplang
40 40
has-props
41 41

  
......
58 58

  
59 59

  
60 60

  
61
21619
61
21882
62 62

63 63
awesome_nested_set
64 64
dir
vendor/plugins/awesome_nested_set/lib/.svn/text-base/awesome_nested_set.rb.svn-base
425 425
        # the base ActiveRecord class, using the :scope declared in the acts_as_nested_set
426 426
        # declaration.
427 427
        def nested_set_scope
428
          options = {:order => quoted_left_column_name}
428
          options = {:order => "#{self.class.table_name}.#{quoted_left_column_name}"}
429 429
          scopes = Array(acts_as_nested_set_options[:scope])
430 430
          options[:conditions] = scopes.inject({}) do |conditions,attr|
431 431
            conditions.merge attr => self[attr]
......
444 444
        # Prunes a branch off of the tree, shifting all of the elements on the right
445 445
        # back to the left so the counts still work.
446 446
        def prune_from_tree
447
          return if right.nil? || left.nil? || !self.class.exists?(id)
447
          return if right.nil? || left.nil? || leaf? || !self.class.exists?(id)
448 448

  
449 449
          delete_method = acts_as_nested_set_options[:dependent] == :destroy ?
450 450
            :destroy_all : :delete_all
451 451

  
452
          # TODO: should destroy children (not descendants) when deleted_method is :destroy_all
452 453
          self.class.base_class.transaction do
453 454
            reload_nested_set
454 455
            nested_set_scope.send(delete_method,
......
466 467
              ["#{quoted_right_column_name} >= ?", right]
467 468
            )
468 469
          end
470
          
471
          # Reload is needed because children may have updated their parent (self) during deletion.
472
          reload
469 473
        end
470 474

  
471 475
        # reload left, right, and parent
vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
425 425
        # the base ActiveRecord class, using the :scope declared in the acts_as_nested_set
426 426
        # declaration.
427 427
        def nested_set_scope
428
          options = {:order => quoted_left_column_name}
428
          options = {:order => "#{self.class.table_name}.#{quoted_left_column_name}"}
429 429
          scopes = Array(acts_as_nested_set_options[:scope])
430 430
          options[:conditions] = scopes.inject({}) do |conditions,attr|
431 431
            conditions.merge attr => self[attr]
......
444 444
        # Prunes a branch off of the tree, shifting all of the elements on the right
445 445
        # back to the left so the counts still work.
446 446
        def prune_from_tree
447
          return if right.nil? || left.nil? || !self.class.exists?(id)
447
          return if right.nil? || left.nil? || leaf? || !self.class.exists?(id)
448 448

  
449 449
          delete_method = acts_as_nested_set_options[:dependent] == :destroy ?
450 450
            :destroy_all : :delete_all
451 451

  
452
          # TODO: should destroy children (not descendants) when deleted_method is :destroy_all
452 453
          self.class.base_class.transaction do
453 454
            reload_nested_set
454 455
            nested_set_scope.send(delete_method,
......
466 467
              ["#{quoted_right_column_name} >= ?", right]
467 468
            )
468 469
          end
470
          
471
          # Reload is needed because children may have updated their parent (self) during deletion.
472
          reload
469 473
        end
470 474

  
471 475
        # reload left, right, and parent
vendor/plugins/awesome_nested_set/lib/awesome_nested_set/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/vendor/plugins/awesome_nested_set/lib/awesome_nested_set
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/awesome_nested_set/lib/awesome_nested_set
6 6
http://redmine.rubyforge.org/svn
7 7

  
8 8

  
......
32 32

  
33 33

  
34 34

  
35
2011-03-03T11:05:12.000000Z
35
2011-06-06T13:15:00.000000Z
36 36
d15393e7ec4757df0e53641d9a8d76f4
37 37
2008-12-20T12:22:38.158335Z
38 38
2149
......
66 66

  
67 67

  
68 68

  
69
2011-03-03T11:05:12.000000Z
69
2011-06-06T13:15:00.000000Z
70 70
d4a9622144313fa6b56117a6c1f11e61
71 71
2008-12-20T12:22:38.158335Z
72 72
2149
......
100 100

  
101 101

  
102 102

  
103
2011-03-03T11:05:12.000000Z
103
2011-06-06T13:15:00.000000Z
104 104
cebe8bf25e6f479251be38c80a246574
105 105
2008-12-20T12:22:38.158335Z
106 106
2149

Also available in: Unified diff