Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1652

Přidáno uživatelem David Raška před asi 12 roky(ů)

Opravy:
- #277: oprava filtru u posilani zprav a exportu clenu

Zobrazit rozdíly:

freenetis/branches/testing/application/controllers/notifications.php
NULL => '----- '.__('Select message').' -----'
) + $arr_messages;
$form = new Forge(url::base().url::current());
$form = new Forge(url::base().url::current(TRUE));
$form->dropdown('message_id')
->label('Message')
->options($arr_messages)
->rules('required');
$hiddens = array();
form::create_hiddens($hiddens, $input, '');
foreach ($hiddens as $hidden)
{
$form->hidden($hidden['name'])
->value($hidden['value']);
}
$form->submit('Next step');
......
$form_data = $form->as_array();
$message_id = arr::remove('message_id', $form_data);
url::redirect(url_lang::base().'notifications/members/'.$message_id.'/?'.http_build_query($form_data));
url::redirect(url_lang::base().'notifications/members/'.$message_id.'/'.server::query_string());
}
$breadcrumbs = breadcrumbs::add()
......
$member_model = new Member_Model();
$filter_form = new Filter_form('m');
$filter_form->autoload();
$filter_form = Members_Controller::create_filter_form();
$total_members = $member_model
->count_all_members(
......
$view->content = new View('show_all');
$view->content->headline = $headline;
$view->content->table = $grid;
$view->content->status_message_info = url_lang::lang('help.notification_settings');
$view->render(TRUE);
}
else
......
$view->content = new View('show_all');
$view->content->headline = $headline;
$view->content->table = $grid;
$view->content->status_message_info = url_lang::lang('help.notification_settings');
$view->render(TRUE);
}
else
freenetis/branches/testing/application/controllers/members.php
if (!$this->acl_check_view(get_class($this), 'members'))
Controller::error(ACCESS);
$enum_type_model = new Enum_type_Model();
$town_model = new Town_Model();
$street_model = new Street_Model();
$filter_form = Members_Controller::create_filter_form();
// filter form
$filter_form = new Filter_form('m');
$filter_form->add('name')
->callback('json/member_name');
$filter_form->add('id')
->type('number');
$filter_form->add('type')
->type('select')
->values(
$enum_type_model->get_values(
Enum_type_Model::MEMBER_TYPE_ID
)
);
$filter_form->add('membership_interrupt')
->type('select')
->values(arr::bool());
$filter_form->add('balance')
->table('a')
->type('number');
$filter_form->add('variable_symbol')
->table('vs')
->callback('json/variable_symbol');
$filter_form->add('entrance_date')
->type('date');
$filter_form->add('leaving_date')
->type('date');
$filter_form->add('entrance_fee')
->type('number');
$filter_form->add('comment');
$filter_form->add('registration')
->type('select')
->values(arr::bool());
$filter_form->add('organization_identifier')
->callback('json/organization_identifier');
$filter_form->add('town')
->type('select')
->table('t')
->values(
array_unique(
$town_model->select_list('town', 'town')
)
);
$filter_form->add('street')
->type('select')
->table('s')
->values(
array_unique(
$street_model->select_list('street', 'street')
)
);
$filter_form->add('street_number')
->type('number')
->table('ap');
$filter_form->add('redirect_type_id')
->label(__('Redirection'))
->type('select')
->values(array
(
Message_Model::INTERRUPTED_MEMBERSHIP_MESSAGE => __('Membership interrupt'),
Message_Model::DEBTOR_MESSAGE => __('Debtor'),
Message_Model::PAYMENT_NOTICE_MESSAGE => __('Payment notice'),
Message_Model::UNALLOWED_CONNECTING_PLACE_MESSAGE => __('Unallowed connecting place'),
Message_Model::USER_MESSAGE => __('User message')
))->table('ms');
$filter_form->add('whitelisted')
->label(__('Whitelist'))
->type('select')
->table('ip')
->values(Ip_address_Model::get_whitelist_types());
$filter_form->add('cloud')
->table('cl')
->type('select')
->values(ORM::factory('cloud')->select_list());
// gets new selector
if (is_numeric($this->input->get('record_per_page')))
$limit_results = (int) $this->input->get('record_per_page');
......
}
}
/**
* Static function for creating filter form
* due to this filter is used in multiple controllers
*
* @return \Filter_form
*/
public static function create_filter_form()
{
$enum_type_model = new Enum_type_Model();
$town_model = new Town_Model();
$street_model = new Street_Model();
// filter form
$filter_form = new Filter_form('m');
$filter_form->add('name')
->callback('json/member_name');
$filter_form->add('id')
->type('number');
$filter_form->add('type')
->type('select')
->values(
$enum_type_model->get_values(
Enum_type_Model::MEMBER_TYPE_ID
)
);
$filter_form->add('membership_interrupt')
->type('select')
->values(arr::bool());
$filter_form->add('balance')
->table('a')
->type('number');
$filter_form->add('variable_symbol')
->table('vs')
->callback('json/variable_symbol');
$filter_form->add('entrance_date')
->type('date');
$filter_form->add('leaving_date')
->type('date');
$filter_form->add('entrance_fee')
->type('number');
$filter_form->add('comment');
$filter_form->add('registration')
->type('select')
->values(arr::bool());
$filter_form->add('organization_identifier')
->callback('json/organization_identifier');
$filter_form->add('town')
->type('select')
->table('t')
->values(
array_unique(
$town_model->select_list('town', 'town')
)
);
$filter_form->add('street')
->type('select')
->table('s')
->values(
array_unique(
$street_model->select_list('street', 'street')
)
);
$filter_form->add('street_number')
->type('number')
->table('ap');
$filter_form->add('redirect_type_id')
->label(__('Redirection'))
->type('select')
->values(array
(
Message_Model::INTERRUPTED_MEMBERSHIP_MESSAGE => __('Membership interrupt'),
Message_Model::DEBTOR_MESSAGE => __('Debtor'),
Message_Model::PAYMENT_NOTICE_MESSAGE => __('Payment notice'),
Message_Model::UNALLOWED_CONNECTING_PLACE_MESSAGE => __('Unallowed connecting place'),
Message_Model::USER_MESSAGE => __('User message')
))->table('ms');
$filter_form->add('whitelisted')
->label(__('Whitelist'))
->type('select')
->table('ip')
->values(Ip_address_Model::get_whitelist_types());
$filter_form->add('cloud')
->table('cl')
->type('select')
->values(ORM::factory('cloud')->select_list());
return $filter_form;
}
}

Také k dispozici: Unified diff