admin delete object save filters and grid page

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index ac44505df8ec10cb2a23641fb2729c621db897e0..cb38aa1aa881e35ef72a3fc37976b8f1387c9552 100644 (file)
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -424,7 +424,9 @@ class IPF_Admin_Model{
         if ($request->method == 'POST'){
             AdminLog::logAction($request, $o, AdminLog::DELETION);
             $o->delete();
-            $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel));
+            $url = @$request->POST['ipf_referrer'];
+            if ($url=='')
+                   $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel));
             return new IPF_HTTP_Response_Redirect($url);
         }
         $context = array(
@@ -434,6 +436,7 @@ class IPF_Admin_Model{
             'lapp'=>$lapp,
             'lmodel'=>$lmodel,
             'affected'=>array(),
+            'ipf_referrer'=>@$request->GET['ipf_referrer'],
                'admin_title' => IPF::get('admin_title'),
         );
         return IPF_Shortcuts::RenderToResponse('admin/delete.html', $context, $request);

diff --git a/ipf/admin/templates/admin/change.html b/ipf/admin/templates/admin/change.html
index 22f57744c038c7c429e25cc76686bb4628d0e1f1..b0ac28239997c98eab8c85720cbca254c4f86b52 100644 (file)
--- a/ipf/admin/templates/admin/change.html
+++ b/ipf/admin/templates/admin/change.html
@@ -10,6 +10,8 @@
 {literal}
 $(document).ready(function(){
        $("#id_ipf_referrer").val(document.referrer);
+       var del_href = $("#id_a_delete").attr("href");
+       $("#id_a_delete").attr("href", del_href+'?ipf_referrer='+document.referrer);
 });
 {/literal}
 </script>
@@ -58,7 +60,7 @@ $(document).ready(function(){
             {/foreach}
                {/if}
                    <div class="submit-row">
-                       {if ($mode=='change') && (array_search('delete',$perms)!==false)}<p class="float-left"><a href="{url 'IPF_Admin_Views_DeleteItem', array($lapp, $lmodel, $object.pk())}" class="deletelink">Delete</a></p>{/if}
+                       {if ($mode=='change') && (array_search('delete',$perms)!==false)}<p class="float-left"><a id="id_a_delete" href="{url 'IPF_Admin_Views_DeleteItem', array($lapp, $lmodel, $object.pk())}" class="deletelink">Delete</a></p>{/if}
                        {if ($mode=='change') && (array_search('change',$perms)!==false)}<input type="submit" value="Save" class="default" />{/if}
                 {if ($mode=='add') && (array_search('add',$perms)!==false)}<input type="submit" value="Add" class="default" />{/if}
                 <input type="button" value="Cancel" onclick="javascript:history.back();" />

diff --git a/ipf/admin/templates/admin/delete.html b/ipf/admin/templates/admin/delete.html
index 410b68550b31fceec463186569dc8434cf6f8cd2..5ce856a54b76c25a098b00551f50d63140ab64e6 100644 (file)
--- a/ipf/admin/templates/admin/delete.html
+++ b/ipf/admin/templates/admin/delete.html
@@ -6,6 +6,7 @@
 <div id="content" class="colM">
     <h1>{$page_title}</h1>
     <form method="post">
+       <input type="hidden" name="ipf_referrer" id="id_ipf_referrer" value="{$ipf_referrer}" />
     <p>Are you sure you want to delete <em>{$object}</em>?
     </p>
     {if count($affected) > 0}