Dotclear


Ignore:
Timestamp:
09/22/13 11:38:22 (12 years ago)
Author:
Dsls
Branch:
default
Parents:
1998:dae906985ebb (diff), 1905:d72d24250853 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Fusion avec actionsreloaded

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • admin/posts.php

    r1806 r1999  
    121121$show_filters = false; 
    122122 
    123 $page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1; 
     123$page = !empty($_GET['page']) ? max(1,(integer) $_GET['page']) : 1; 
    124124$nb_per_page =  30; 
    125125 
  • admin/posts.php

    r1912 r1999  
    103103 
    104104# Actions combo box 
    105 $combo_action = array(); 
    106 if ($core->auth->check('publish,contentadmin',$core->blog->id)) 
    107 { 
    108      $combo_action[__('Status')] = array( 
    109           __('Publish') => 'publish', 
    110           __('Unpublish') => 'unpublish', 
    111           __('Schedule') => 'schedule', 
    112           __('Mark as pending') => 'pending' 
    113      ); 
    114 } 
    115 $combo_action[__('Mark')] = array( 
    116      __('Mark as selected') => 'selected', 
    117      __('Mark as unselected') => 'unselected' 
    118 ); 
    119 $combo_action[__('Change')] = array( 
    120      __('Change category') => 'category', 
    121      __('Change language') => 'lang'); 
    122 if ($core->auth->check('admin',$core->blog->id)) 
    123 { 
    124      $combo_action[__('Change')] = array_merge($combo_action[__('Change')], 
    125           array(__('Change author') => 'author')); 
    126 } 
    127 if ($core->auth->check('delete,contentadmin',$core->blog->id)) 
    128 { 
    129      $combo_action[__('Delete')] = array(__('Delete') => 'delete'); 
    130 } 
    131  
    132 # --BEHAVIOR-- adminPostsActionsCombo 
    133 $core->callBehavior('adminPostsActionsCombo',array(&$combo_action)); 
     105 
     106$posts_actions_page = new dcPostsActionsPage($core,'posts.php'); 
     107 
     108$posts_actions_page->process(); 
    134109 
    135110/* Get posts 
     
    304279     # Show posts 
    305280     $post_list->display($page,$nb_per_page, 
    306      '<form action="posts_actions.php" method="post" id="form-entries">'. 
     281     '<form action="posts.php" method="post" id="form-entries">'. 
    307282      
    308283     '%s'. 
     
    312287      
    313288     '<p class="col right"><label for="action" class="classic">'.__('Selected entries action:').'</label> '. 
    314      form::combo('action',$combo_action). 
     289     form::combo('action',$posts_actions_page->getCombo()). 
    315290     '<input type="submit" value="'.__('ok').'" /></p>'. 
    316291     form::hidden(array('user_id'),$user_id). 
Note: See TracChangeset for help on using the changeset viewer.

Sites map