Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 18ac9009

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

Fix merge issue that removed all staff from developer branch :-).

Zobrazit rozdíly:

application/controllers/bank_accounts.php
->label('Owner ID')
->type('number');
// bank accounts
// bank accounts
$total_baccounts = $bank_account_model->count_bank_accounts($filter_form->as_sql());
if (($sql_offset = ($page - 1) * $limit_results) > $total_baccounts)
......
// form
if (!isset($member_id) || $member_id != Member_Model::ASSOCIATION)
{
// members list
$arr_members = ORM::factory('member')->select_list();
$arr_members = arr::merge(
array(NULL => '----- '.__('Select member').' -----'),
arr::from_objects(ORM::factory('member')->get_all_members_to_dropdown())
);
if (isset($arr_members[1]))
{
unset($arr_members[1]);
}
$form = new Forge('bank_accounts/add/');
$form = new Forge();
$form->dropdown('member_id')
->label('Member name')
->options($arr_members)
->selected($this->session->get('member_id'))
->rules('required')
->filter_button('members')
->style('width:200px');
}
else

Také k dispozici: Unified diff