Changeset 1857

Timestamp:

27.07.2010 22:44:59 (6 weeks ago)

Author:

francois

Message:

[1.5][1.6] Fixed generated nested_set getter and setter when the level column is called "level" (closes #1051)

Location:

branches

Files:

• 1.5/generator/lib/behavior/nestedset/NestedSetBehaviorObjectBuilderModifier.php (modified) (1 diff)
• 1.6/generator/lib/behavior/nestedset/NestedSetBehaviorObjectBuilderModifier.php (modified) (1 diff)

branches/1.5/generator/lib/behavior/nestedset/NestedSetBehaviorObjectBuilderModifier.php

@@ -117 +117 @@
                 $this->addProcessNestedSetQueries($script);
                 
-                $this->addGetLeft($script);
-                $this->addGetRight($script);
-                $this->addGetLevel($script);
-                if ($this->getParameter('use_scope') == 'true')
-                {
+                if ($this->getColumnPhpName('left_column') != 'LeftValue') {
+                        $this->addGetLeft($script);
+                }
+                if ($this->getColumnPhpName('right_column') != 'RightValue') {
+                        $this->addGetRight($script);
+                }
+                if ($this->getColumnPhpName('level_column') != 'Level') {
+                        $this->addGetLevel($script);
+                }
+                if ($this->getParameter('use_scope') == 'true') {
                         $this->addGetScope($script);
                 }
-
-                $this->addSetLeft($script);
-                $this->addSetRight($script);
-                $this->addSetLevel($script);
-                if ($this->getParameter('use_scope') == 'true')
-                {
+                
+                if ($this->getColumnPhpName('left_column') != 'LeftValue') {
+                        $this->addSetLeft($script);
+                }
+                if ($this->getColumnPhpName('right_column') != 'RightValue') {
+                        $this->addSetRight($script);
+                }
+                if ($this->getColumnPhpName('level_column') != 'Level') {
+                        $this->addSetLevel($script);
+                }
+                if ($this->getParameter('use_scope') == 'true') {
                         $this->addSetScope($script);
                 }

branches/1.6/generator/lib/behavior/nestedset/NestedSetBehaviorObjectBuilderModifier.php

@@ -117 +117 @@
                 $this->addProcessNestedSetQueries($script);
                 
-                $this->addGetLeft($script);
-                $this->addGetRight($script);
-                $this->addGetLevel($script);
-                if ($this->getParameter('use_scope') == 'true')
-                {
+                if ($this->getColumnPhpName('left_column') != 'LeftValue') {
+                        $this->addGetLeft($script);
+                }
+                if ($this->getColumnPhpName('right_column') != 'RightValue') {
+                        $this->addGetRight($script);
+                }
+                if ($this->getColumnPhpName('level_column') != 'Level') {
+                        $this->addGetLevel($script);
+                }
+                if ($this->getParameter('use_scope') == 'true') {
                         $this->addGetScope($script);
                 }
-
-                $this->addSetLeft($script);
-                $this->addSetRight($script);
-                $this->addSetLevel($script);
-                if ($this->getParameter('use_scope') == 'true')
-                {
+                
+                if ($this->getColumnPhpName('left_column') != 'LeftValue') {
+                        $this->addSetLeft($script);
+                }
+                if ($this->getColumnPhpName('right_column') != 'RightValue') {
+                        $this->addSetRight($script);
+                }
+                if ($this->getColumnPhpName('level_column') != 'Level') {
+                        $this->addSetLevel($script);
+                }
+                if ($this->getParameter('use_scope') == 'true') {
                         $this->addSetScope($script);
                 }