Projekt

Obecné

Profil

« Předchozí | Další » 

Revize c478920d

Přidáno uživatelem Ondřej Fibich před asi 9 roky(ů)

Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..

Zobrazit rozdíly:

application/controllers/members_whitelists.php
->type('select')
->label('Whitelist')
->values(Ip_address_Model::get_whitelist_types());
$filter_form->add('user_name')
->label('Added by')
->type('combo')
->callback('json/user_fullname');
$filter_form->add('balance')
->type('number');
......
$grid->order_callback_field('whitelisted')
->label('Whitelist')
->callback('callback::whitelisted_field');
$grid->order_callback_field('user_name')
->label('Added by')
->callback('callback::user_field');
$grid->order_callback_field('balance')
->callback('callback::balance_field');
......
$grid->callback_field('active')
->callback('callback::active_field');
$grid->callback_field('user_name')
->label('Added by')
->callback('callback::user_field');
$grid->field('comment');
......
$mw->since = $form_data['since'];
$mw->until = $form_data['until'];
$mw->comment = $form_data['comment'];
$mw->user_id = $this->user_id;
$mw->save_throwable();
// reactivate messages
......
$mw->since = $form_data['since'];
$mw->until = $form_data['until'];
$mw->comment = $form_data['comment'];
$mw->user_id = $this->user_id;
$mw->save_throwable();
// reactivate messages

Také k dispozici: Unified diff