[dw-free] Inbox sub-filter refreshes to wrong page when deleting all

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/4bd1a2a86d99]

http://bugs.dwscoalition.org/show_bug.cgi?id=132

When deleting items in the inbox, fall back to the view you were on, not the
main Inbox.

Patch by afuna.

Files modified:

• htdocs/inbox/index.bml

--------------------------------------------------------------------------------
diff -r dbd42124e637 -r 4bd1a2a86d99 htdocs/inbox/index.bml
--- a/htdocs/inbox/index.bml	Sun Sep 13 05:02:24 2009 +0000
+++ b/htdocs/inbox/index.bml	Sun Sep 13 05:04:35 2009 +0000
@@ -51,8 +51,8 @@ body<=
 
     # Take a supplied filter but default it to undef unless it is valid
     my $view = $POST{view} || $GET{view} || undef;
-    $view = undef if ($view eq 'archive' && ! LJ::is_enabled('esn_archive'));
-    $view = undef if ($view && !LJ::NotificationInbox->can("${view}_items"));
+    $view = undef if $view eq 'archive' && ! LJ::is_enabled('esn_archive');
+    $view = undef if $view && !LJ::NotificationInbox->can("${view}_items");
 
     # Bolds the selected View/Folder
     my $selected_folder = $view || 'all';
@@ -121,9 +121,11 @@ body<=
 
     $body .= LJ::error_list(@errors) if (@errors);
 
+    my $viewarg = $view  ? "&view=$view" : "";
     $body .= qq{
     <div class="inbox_newitems pkg">
-        <span class="esnlinks"><a href="$LJ::SITEROOT/inbox/?page=$page" id="RefreshLink"><?_ml inbox.refresh _ml?></a> | <a href="$LJ::SITEROOT/manage/subscriptions/"><?_ml inbox.manage_settings _ml?></a></span>
+        <span class="esnlinks"><a href="$LJ::SITEROOT/inbox/?page=$page$viewarg" id="RefreshLink"><?_ml inbox.refresh _ml?></a> |
+          <a href="$LJ::SITEROOT/manage/subscriptions/"><?_ml inbox.manage_settings _ml?></a></span>
     </div> };
 
     # Inbox Nav
--------------------------------------------------------------------------------

Comments

[denise]

oh my god i love you and afuna so much