Changeset 263

Timestamp:

06/24/07 08:10:24 (1 year ago)

Author:

bermiferrer

Message:

Fixing bug in the scaffold generator when using a model with a different name.

Files:

• trunk/script/generators/scaffold/templates/controller.php (modified) (4 diffs)

trunk/script/generators/scaffold/templates/controller.php

@@ -6 +6 @@
-<?php 
-    if($model_name != $controller_name){ // if equal will be handled by the Akelos directly
-
+\n\n
-    }
-?>
@@ -41 +41 @@
-        }
-    }
+    <?php  if($model_name != $controller_name){ ?>
+
+    function edit()
+    {
+        if(!empty($this->params['id'])){
+            if(empty($this-><?php echo $singular_name?>->id) || $this-><?php echo $singular_name?>->id != $this->params['id']){
+                $this-><?php echo $singular_name?> =& $this-><?php echo $model_name?>->find($this->params['id']);
+            }
+        }else{
+            $this->redirectToAction('listing');
+        }
+
+        if(!empty($this->params['<?php echo $singular_name?>'])){
+            $this-><?php echo $singular_name?>->setAttributes($this->params['<?php echo $singular_name?>']);
+            if($this->Request->isPost() && $this-><?php echo $singular_name?>->save()){
+                $this->flash['notice'] = $this->t('<?php echo $model_name?> was successfully updated.');
+                $this->redirectTo(array('action' => 'show', 'id' => $this-><?php echo $singular_name?>->getId()));
+            }
+        }
+    }
+    <?php } else { ?>
-
-    function edit()
@@ -48 +69 @@
-        }
-        if(!empty($this->params['<?php echo $singular_name?>']) && !empty($this->params['id'])){
-            <?php 
-            if($model_name != $controller_name){ // if equal will be handled by the Akelos directly
-                ?>if(empty($this-><?php echo $singular_name?>->id) || $this-><?php echo $singular_name?>->id != $this->params['id']){
-                    $this-><?php echo $singular_name?> =& $this-><?php echo $model_name?>->find($this->params['id']);
-                }<?php
-            }
-            ?>
-            $this-><?php echo $singular_name?>->setAttributes($this->params['<?php echo $singular_name?>']);
-            if($this->Request->isPost() && $this-><?php echo $singular_name?>->save()){
@@ -62 +76 @@
-        }
-    }
-
+
+
-    function destroy()
-    {