Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 952

Přidáno uživatelem Michal Kliment před více než 13 roky(ů)

Merge z testingu do vetve prirazeni podsiti clenum: Oprava nefunkcnich odkazu v menu. Oprava neprovazani bankovni uctu sdruzeni s jeho podvojnym protejskem pri instalaci.

Zobrazit rozdíly:

freenetis/branches/subnets_assigning/application/controllers/installation.php
$doubleentry_bank_account->name = $form_data["account_name"];
$doubleentry_bank_account->account_attribute_id = Account_attribute_Model::$bank;
$doubleentry_bank_account->comment = url_lang::lang('texts.Bank accounts');
$doubleentry_bank_account->add($bank_account);
$doubleentry_bank_account->save();
$doubleentry_bank_account->add($bank_account);
// double-entry account of bank fees
$bank_fees_account = new Account_Model();
$bank_fees_account->member_id = $member->id;
freenetis/branches/subnets_assigning/application/upgrade_sql/upgrade_sql.php
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci;",
"INSERT INTO allowed_subnets
SELECT NULL, m.id AS member_id, IFNULL(ip1.subnet_id,ip2.subnet_id) AS subnet_id, 1 AS enabled FROM members m
SELECT NULL, m.id AS member_id, IFNULL(ip1.subnet_id,ip2.subnet_id) AS subnet_id, 1 AS enabled, CURRENT_TIMESTAMP FROM members m
JOIN users u ON u.member_id = m.id
JOIN devices d ON d.user_id = u.id
JOIN ifaces i ON i.device_id = d.id
freenetis/branches/subnets_assigning/application/views/menu.php
<li><?php echo html::anchor(url_lang::base().'voip/show_all', url_lang::lang('texts.VoIP')) ?></li>
<?php } ?>
<li><?php echo html::anchor(url_lang::base().'clouds/show_all', url_lang::lang('texts.Clouds')) ?></li>
<li><?php echo html::anchor(url_lang::base().'config_files/show_all', url_lang::lang('texts.Configuration files')) ?></li>
<li><?php echo html::anchor(url_lang::base().'monitoring/show_all', url_lang::lang('texts.Monitoring')) ?></li>
<li><?php echo html::anchor(url_lang::base().'tools/show_all', url_lang::lang('texts.Tools')) ?></li>
<li><?php echo html::anchor(url_lang::base().'config_files/dhcp', url_lang::lang('texts.Configuration files')) ?></li>
<li><?php echo html::anchor(url_lang::base().'monitoring/smokeping', url_lang::lang('texts.Monitoring')) ?></li>
<li><?php echo html::anchor(url_lang::base().'tools/ssh', url_lang::lang('texts.Tools')) ?></li>
<?php if (Settings::get('ulogd_enabled') == 1): ?>
<li><?php echo html::anchor(url_lang::base().'ulogd/actual_ip_addresses_traffic', url_lang::lang('texts.Traffic')) ?></li>
<?php endif; ?>

Také k dispozici: Unified diff