Pluf Framework Commit Details

Date:

2009-01-29 05:26:34 (16 years 3 months ago)

Author:

Loic d'Anterroches

Branch:

develop, master

Commit:

0fcf474b9fbc8e85c2f4779bd85b752b918107a5

Parents:

138931df6fbf7ea438dcea7133a92230da595104

Message:

Fixed issue 109, typo dans Pluf_Views::deleteObject().

Changes:

File differences

-310
311 311
312 312
313 
313
314 314
315 315
316 316
317 317
318 
319 
320 
318
319
320
321 321
322 322
323 323
+        $model = $p['model'];␊
        $context = (isset($p['extra_context'])) ? $p['extra_context'] : array();␊
        $template = (isset($p['template'])) ? $p['template'] : strtolower($model).'_confirm_delete.html';␊
        $post_save_keys = (isset($p['post_save_redirect_keys'])) ? $p['post_save_redirect_keys'] : array();␊
        $post_delete_keys = (isset($p['post_delete_redirect_keys'])) ? $p['post_delete_redirect_keys'] : array();␊
␊
        $object = Pluf_Shortcuts_GetObjectOr404($model, $id);␊
        if ($request->method == 'POST') {␊
            $object->delete();␊
            if (isset($p['post_save_redirect'])) {␊
                $url = Pluf_HTTP_URL_urlForView($p['post_save_redirect'],␊
                                                $post_save_keys);␊
            if (isset($p['post_delete_redirect'])) {␊
                $url = Pluf_HTTP_URL_urlForView($p['post_delete_redirect'],␊
                                                $post_delete_keys);␊
            } else {␊
                throw new Exception('No URL to redirect to from generic delete view.');␊
            }␊
         $model = $p['model'];␊
         $context = (isset($p['extra_context'])) ? $p['extra_context'] : array();␊
         $template = (isset($p['template'])) ? $p['template'] : strtolower($model).'_confirm_delete.html';␊
-        $post_save_keys = (isset($p['post_save_redirect_keys'])) ? $p['post_save_redirect_keys'] : array();␊
+        $post_delete_keys = (isset($p['post_delete_redirect_keys'])) ? $p['post_delete_redirect_keys'] : array();␊
 ␊
         $object = Pluf_Shortcuts_GetObjectOr404($model, $id);␊
         if ($request->method == 'POST') {␊
             $object->delete();␊
-            if (isset($p['post_save_redirect'])) {␊
-                $url = Pluf_HTTP_URL_urlForView($p['post_save_redirect'],␊
-                                                $post_save_keys);␊
+            if (isset($p['post_delete_redirect'])) {␊
+                $url = Pluf_HTTP_URL_urlForView($p['post_delete_redirect'],␊
+                                                $post_delete_keys);␊
             } else {␊
                 throw new Exception('No URL to redirect to from generic delete view.');␊
             }␊

Download the corresponding diff file

Pluf Framework

File differences

Branches

Tags