Changeset 1476:c45f3be639b6

Timestamp:

08/19/13 16:38:02 (11 years ago)

Author:

Dsls

Branch:

default

Children:

1477:6ffbcd3cfb6f, 1480:9451796b02e2

Message:

• Selection is kept when going back to entries
• Notifications when applying changes
• Added "back to entries" link

see #1540

Files:

• admin/posts.php (modified) (1 diff)
• admin/posts_actions.php (modified) (15 diffs)
• inc/admin/lib.pager.php (modified) (4 diffs)

admin/posts.php

@@ -252 +252 @@
           ))
 );
-
+if (!empty($_GET['upd'])) {
+     dcPage::message(__('Selected entries have been successfully updated.'));
+} elseif (!empty($_GET['del'])) {
+     dcPage::message(__('Selected entries have been successfully deleted.'));
+}
 if (!$core->error->flag())
 {

admin/posts_actions.php

@@ -106 +106 @@
      
     /**
+     * getEntriesQS - returns the list of entry fields as query string
+     *
+     * @access public
+      * @return the list of entry fields, html encoded
+     */
+     public function getEntriesQS() {
+          $ret=array();
+          foreach ($this->entries as $id=>$title) {
+               $ret[] = 'entries[]='.$id;
+          }
+          return join('&',$ret);
+     }
+     
+    /**
      * __toString - magic method. -- DEPRECATED here
       *              This method is only used to preserve compatibility with plugins 
@@ -118 +132 @@
 }
 
-
-function listEntries($titles) {
-     $ret = 
-          '<table class="posts-list"><tr>'.
-          '<th colspan="2">'.__('Title').'</th>'.
-          '</tr>';
-     foreach ($titles as $id=>$title) {
-          $ret .= 
-               '<tr><td>'.
-               form::checkbox(array('entries[]'),$id,true,'','').'</td>'.
-               '<td>'.   $title.'</td></tr>';
-     }
-     $ret .= '</table>';
-     return $ret;
-}
+$fields = new FieldsList();
 
 /* Actions
@@ -179 +179 @@
      while ($posts->fetch())  {
           $posts_ids[] = $posts->post_id;
-     }
+          $fields->addEntry($posts->post_id,$posts->post_title);
+     }
+     // Redirection including selected entries
+     $redir_sel = $redir.'&'.$fields->getEntriesQS();
      
      # --BEHAVIOR-- adminPostsActions
@@ -197 +200 @@
                $core->blog->updPostsStatus($posts_ids,$status);
                
-               http::redirect($redir);
+               http::redirect($redir_sel.'&upd=1');
           }
           catch (Exception $e)
@@ -210 +213 @@
                $core->blog->updPostsSelected($posts_ids,$action == 'selected');
                
-               http::redirect($redir);
+               http::redirect($redir_sel."&upd=1");
           }
           catch (Exception $e)
@@ -233 +236 @@
                $core->blog->delPosts($posts_ids);
                
-               http::redirect($redir);
+               http::redirect($redir."&del=1");
           }
           catch (Exception $e)
@@ -266 +269 @@
                $core->blog->updPostsCategory($posts_ids, $new_cat_id);
                
-               http::redirect($redir);
+               http::redirect($redir_sel."&upd=1");
           }
           catch (Exception $e)
@@ -288 +291 @@
                $cur->update('WHERE post_id '.$core->con->in($posts_ids));
                
-               http::redirect($redir);
+               http::redirect($redir_sel."&upd=1");
           }
           catch (Exception $e)
@@ -304 +307 @@
                $cur->update('WHERE post_id '.$core->con->in($posts_ids));
                
-               http::redirect($redir);
+               http::redirect($redir_sel."&upd=1");
           }
           catch (Exception $e)
@@ -325 +328 @@
           ))
      );
+     
+     echo '<p><a class="back" href="'.html::escapeURL($redir_sel).'">'.__('Back to entries list').'</a></p>';
 
      dcPage::close();
@@ -361 +366 @@
      dcPage::close();
      exit;
-}
-
-$fields = new FieldsList();
-while ($posts->fetch()) {
-     $fields->addEntry($posts->post_id,$posts->post_title);
 }
 
@@ -403 +403 @@
                __('Change category for entries') => ''
      ));
+     
+     echo '<p><a class="back" href="'.html::escapeURL($redir_sel).'">'.__('Back to entries list').'</a></p>';
 
      # categories list
@@ -452 +454 @@
                '<span class="page-title">'.__('Change language for entries').'</span>' => ''
      ));
-     
+     echo '<p><a class="back" href="'.html::escapeURL($redir_sel).'">'.__('Back to entries list').'</a></p>';
+
      # lang list
      # Languages combo
@@ -492 +495 @@
                '<span class="page-title">'.__('Change author for entries').'</span>' => ''
      ));
-     
+     echo '<p><a class="back" href="'.html::escapeURL($redir_sel).'">'.__('Back to entries list').'</a></p>';
+
      echo
      '<form action="posts_actions.php" method="post">'.
@@ -507 +511 @@
 }
 
-echo '<p><a class="back" href="'.html::escapeURL($redir).'">'.__('back').'</a></p>';
-
 dcPage::close();
 ?>

inc/admin/lib.pager.php

@@ -42 +42 @@
                $pager->html_next = $this->html_next;
                $pager->var_page = 'page';
-               
+               $entries = array();
+               if (isset($_REQUEST['entries'])) {
+                    foreach ($_REQUEST['entries'] as $v) {
+                         $entries[(integer)$v]=true;
+                    }
+               }
                $html_block =
                '<table class="clear"><tr>'.
@@ -66 +71 @@
                while ($this->rs->fetch())
                {
-                    echo $this->postLine();
+                    echo $this->postLine(isset($entries[$this->rs->post_id]));
                }
                
@@ -75 +80 @@
      }
      
-     private function postLine()
+     private function postLine($checked)
      {
           if ($this->core->auth->check('categories',$this->core->blog->id)) {
@@ -128 +133 @@
           $res .=
           '<td class="nowrap">'.
-          form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable()).'</td>'.
+          form::checkbox(array('entries[]'),$this->rs->post_id,$checked,'','',!$this->rs->isEditable()).'</td>'.
           '<td class="maximal"><a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
           html::escapeHTML($this->rs->post_title).'</a></td>'.