Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 88

Přidáno uživatelem Tomáš Dulík před asi 16 roky(ů)

Bug: Ve web rozhraní se nezobrazovala položka members.comment. Odstraněno úpravou controllers/members.php a models/member.php

Zobrazit rozdíly:

freenetis/trunk/kohana/application/models/member.php
public function get_member($id)
{
return self::$db->select(array('members.name as namem', 'members.street', 'members.street_number', 'members.town', 'members.ZIP_code', 'members.type as typem', 'members.qos_ceil', 'members.qos_rate', 'members.entrance_fee', 'members.debt_payment_rate', 'members.entrance_fee_left', 'members.must_pay_regular_fee', 'members.current_credit', 'members.entrance_date', 'users.*'))->from('members')->join('users', 'users.member_id = members.id')->where(array('members.id' => (int)$id, 'users.type!=' => 'user'))->limit(1)->get();
return self::$db->select(
array('members.name as namem', 'members.street', 'members.street_number',
'members.town', 'members.ZIP_code',
'members.type as typem', 'members.qos_ceil', 'members.qos_rate',
'members.entrance_fee', 'members.debt_payment_rate', 'members.entrance_fee_left',
'members.must_pay_regular_fee', 'members.current_credit',
'members.entrance_date', 'members.comment',
'users.id', 'member_id',
'users.name', 'middle_name', 'surname',
'pre_title', 'post_title',
'login', 'email', 'users.type', 'phone', 'birthday')
)->from('members')->join('users', 'users.member_id = members.id')->where(array('members.id' => (int)$id, 'users.type!=' => 'user'))->limit(1)->get();
}
/* array('id' => 5, 'title' => 'Demo')
public function get_one_user($)
freenetis/trunk/kohana/application/controllers/members.php
{
$model_members = new Member_Model();
$member_data = $model_members->get_member($member_id)->current();
//print_r($member_data->id);
print_r($member_data);
if ($member_id == $_SESSION['member_id'])
{
if (!$this->gacl_class->acl_check('freenetis', 'view_own', 'all', $_SESSION['username'])) Controller::error(1);
......
$user_data->phone = $form_data['phone'];
$user_data->email = $form_data['email'];
$user_data->type = $form_data['type'];
$user_data->comment = $form_data['comment'];
$user_data->password = sha1($form_data['password']);
$member_data->comment = $form_data['comment'];
$member_data->entrance_date = date("Y-m-d",$form_data['entrance_date']);
$member_data->name = $form_data['membername'];;
$member_data->street = $form_data['street'];
......
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_phone')) $user_data->phone = $form_data['phone'];
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_email')) $user_data->email = $form_data['email'];
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_type')) $user_data->type = $form_data['type'];
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_comment')) $user_data->comment = $form_data['comment'];
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_comment')) $member_data->comment = $form_data['comment'];
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_entrance_date')) $member_data->entrance_date = date("Y-m-d",$form_data['entrance_date']);
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_membersname')) $member_data->name = $form_data['membername'];;

Také k dispozici: Unified diff