Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 558

Přidáno uživatelem Roman Ševčík před téměř 15 roky(ů)

Menší opravy v kontroleru device a setting. Oprava mazaní adres pointu.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/controllers/settings.php
$array[] = html::anchor(url_lang::base().'settings/system', url_lang::lang('texts.System'));
$array[] = html::anchor(url_lang::base().'settings/voip', url_lang::lang('texts.VoIP'));
$array[] = html::anchor(url_lang::base().'settings/gateway', url_lang::lang('texts.Gateway'));
$array[] = html::anchor(url_lang::base().'settings/map', url_lang::lang('texts.Map'));
$this->links = implode(' | ', $array);
}
......
$this->form->group('')->label(url_lang::lang('texts.Map'));
// page title
$this->form->input('map_default_gps')->label(url_lang::lang('texts.Default GPS').':')->rules('length[0,40]|required')->value(addslashes($this->setting->map_default_gps));
$this->form->input('map_google_maps_api_key')->label(url_lang::lang('texts.Google Map API key').':')->rules('length[0,200]|required')->value(addslashes($this->setting->map_google_maps_api_key));
$this->form->submit('submit')->value(url_lang::lang('texts.Save'));
$this->form->input('map_google_maps_api_key')->label(url_lang::lang('texts.Google Map API key').':<span style="margin-left:10px">'.html::anchor('http://code.google.com/intl/cs/apis/maps/signup.html', url_lang::lang('texts.Link')).'</span>')->rules('length[0,200]')->value($this->setting->map_google_maps_api_key);
$this->form->input('map_default_gps')->label(url_lang::lang('texts.Default GPS pososition in map').':')->rules('length[0,50]')->value($this->setting->map_default_gps);
$this->form->submit('submit')->value(url_lang::lang('texts.Save'));
special::required_forge_style($this->form, ' *', 'required');
// form validate
......
$issaved = true;
$form_data['map_default_gps'] = addslashes($form_data['map_default_gps']);
foreach ($form_data as $name => $value)
{
// check if variable exists
freenetis/trunk/kohana/application/controllers/address_points.php
*/
function delete($address_point_id = NULL)
{
// access rights
if (!$this->acl_check_delete(get_class($this), 'address_point'))
Controller::error(ACCESS);
// no parameter
if (!$address_point_id)
Controller::warning(PARAMETER);
......
if (!$address_point->id)
Controller::error(RECORD);
// access rights
if (!$this->acl_check_delete(get_class($this), 'address_point'))
Controller::error(ACCESS);
$members = $address_point->find_related_members();
$devices = $address_point->find_related_devices();
if (count($members)==0)
{
if ($address_point->delete())
$this->session->set_flash('message', url_lang::lang('texts.Address point has been successfully deleted.'));
if (count($devices)==0)
{
if ($address_point->delete())
$this->session->set_flash('message', url_lang::lang('texts.Address point has been successfully deleted.'));
else
$this->session->set_flash('message', url_lang::lang('texts.Error - cant delete address point.'));
}
else
$this->session->set_flash('message', url_lang::lang('texts.Error - cant delete address point.'));
$this->session->set_flash('message', url_lang::lang('texts.At least one device still has this address point.'));
}
else
$this->session->set_flash('message', url_lang::lang('texts.At least one member still has this address point.'));
url::redirect(url_lang::base().'address_points/show_all');
}
function migrate()
freenetis/trunk/kohana/application/controllers/devices.php
$input->add_error('required', url_lang::lang('texts.IP address is required.'));
// checks if exists this ip in database
$ip_model = new ip_address_Model();
if ($ip_model->get_count($this->input->post('ip_address')) > 0)
$ip_address = ORM::factory('ip_address')->find_by_ip_address($this->input->post('ip_address'));
if ($ip_address->id != 0)
{
$input->add_error('required', url_lang::lang('texts.IP address already exists.'));
}

Také k dispozici: Unified diff