Revision 442:753f1380d6bc vendor/plugins/awesome_nested_set

View differences:

vendor/plugins/awesome_nested_set/.svn/all-wcprops
1 1
K 25
2 2
svn:wc:ra_dav:version-url
3
V 58
4
/svn/!svn/ver/4735/trunk/vendor/plugins/awesome_nested_set
3
V 72
4
/svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/awesome_nested_set
5 5
END
6
awesome_nested_set.gemspec
7
K 25
8
svn:wc:ra_dav:version-url
9
V 85
10
/svn/!svn/ver/2304/trunk/vendor/plugins/awesome_nested_set/awesome_nested_set.gemspec
11
END
12
Rakefile
13
K 25
14
svn:wc:ra_dav:version-url
15
V 67
16
/svn/!svn/ver/2304/trunk/vendor/plugins/awesome_nested_set/Rakefile
17
END
18
README.rdoc
19
K 25
20
svn:wc:ra_dav:version-url
21
V 70
22
/svn/!svn/ver/2304/trunk/vendor/plugins/awesome_nested_set/README.rdoc
23
END
24
init.rb
25
K 25
26
svn:wc:ra_dav:version-url
27
V 66
28
/svn/!svn/ver/2304/trunk/vendor/plugins/awesome_nested_set/init.rb
29
END
30
MIT-LICENSE
31
K 25
32
svn:wc:ra_dav:version-url
33
V 70
34
/svn/!svn/ver/2304/trunk/vendor/plugins/awesome_nested_set/MIT-LICENSE
35
END
vendor/plugins/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
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/awesome_nested_set
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

  
......
35 35

  
36 36

  
37 37

  
38
2011-03-03T11:05:13.000000Z
38
2011-06-06T13:15:00.000000Z
39 39
c1f9a7c7c81a0c9150d260757c895ab3
40 40
2008-12-20T12:22:38.158335Z
41 41
2149
......
69 69

  
70 70

  
71 71

  
72
2011-03-03T11:05:13.000000Z
72
2011-06-06T13:15:00.000000Z
73 73
75ea4a8e8109afdbce9214ac3e9aa40a
74 74
2008-12-20T12:22:38.158335Z
75 75
2149
......
103 103

  
104 104

  
105 105

  
106
2011-03-03T11:05:13.000000Z
106
2011-06-06T13:15:00.000000Z
107 107
5d897290320b00753c366c59f40b213e
108 108
2008-12-20T12:22:38.158335Z
109 109
2149
......
137 137

  
138 138

  
139 139

  
140
2011-03-03T11:05:13.000000Z
140
2011-06-06T13:15:00.000000Z
141 141
af5f1806895c92bb03e8855a96d13a64
142 142
2008-12-20T12:22:38.158335Z
143 143
2149
......
174 174

  
175 175

  
176 176

  
177
2011-03-03T11:05:13.000000Z
177
2011-06-06T13:15:00.000000Z
178 178
ba826ae68593d063b726b4e66dcb1e8f
179 179
2008-12-20T12:22:38.158335Z
180 180
2149
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
vendor/plugins/awesome_nested_set/rails/.svn/entries
1 1
10
2 2

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

  
8 8

  
......
32 32

  
33 33

  
34 34

  
35
2011-03-03T11:05:13.000000Z
35
2011-06-06T13:15:00.000000Z
36 36
d5995cbfa2abdc12b57c44d69dc0085b
37 37
2008-12-20T12:22:38.158335Z
38 38
2149
vendor/plugins/awesome_nested_set/test/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/vendor/plugins/awesome_nested_set/test
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/awesome_nested_set/test
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
41b65aff686211d45ba085c1b0791218
37 37
2008-12-20T12:22:38.158335Z
38 38
2149
......
75 75

  
76 76

  
77 77

  
78
2011-03-03T11:05:12.000000Z
78
2011-06-06T13:15:00.000000Z
79 79
d177339aefb3c4a8f280efff48c974b6
80 80
2008-12-20T12:22:38.158335Z
81 81
2149
vendor/plugins/awesome_nested_set/test/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/test/awesome_nested_set
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/awesome_nested_set/test/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
03a414e3247544a5a2334aed005764f3
37 37
2008-12-20T12:22:38.158335Z
38 38
2149
vendor/plugins/awesome_nested_set/test/db/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/vendor/plugins/awesome_nested_set/test/db
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/awesome_nested_set/test/db
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
ae23aecda935bb66e29aa4f02ea9de0a
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
359889e11314c2969bdf7e37475bdc62
71 71
2008-12-20T12:22:38.158335Z
72 72
2149
vendor/plugins/awesome_nested_set/test/fixtures/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/vendor/plugins/awesome_nested_set/test/fixtures
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/awesome_nested_set/test/fixtures
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
460e90d6f219f339e8e4c64aaae0063c
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
4b6a06e11c21a3aadd09e60dee443110
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
e4eb5dbc7f2a2aa2fee79dba9210e769
105 105
2008-12-20T12:22:38.158335Z
106 106
2149
......
134 134

  
135 135

  
136 136

  
137
2011-03-03T11:05:12.000000Z
137
2011-06-06T13:15:00.000000Z
138 138
e8b507fd94ed89b9997c3f9f137290cf
139 139
2008-12-20T12:22:38.158335Z
140 140
2149

Also available in: Unified diff