Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2474

Přidáno uživatelem Ondřej Fibich před více než 9 roky(ů)

Opravy: refs #1004: Tabulka clenu - nelze radit dle typu

Zobrazit rozdíly:

freenetis/branches/1.2/application/controllers/members.php
->callback('callback::registration_field');
}
$grid->order_callback_field('type')
$grid->order_callback_field('type', 'type_name')
->callback('callback::member_type_field');
$grid->order_field('name');
freenetis/branches/1.2/application/models/member.php
SELECT id, id AS member_id, name AS member_name, registration, registrations,
surname, firstname,
name, street, street_number, town, quarter, variable_symbol, aid, balance,
a_comment, a_comments_thread_id, type, entrance_date, leaving_date,
a_comment, a_comments_thread_id, type, type_name, entrance_date, leaving_date,
redirect_type_id, GROUP_CONCAT(DISTINCT redirect_type SEPARATOR ', ') AS redirect,
GROUP_CONCAT(DISTINCT redirect_type_text SEPARATOR ', \n') AS redirect_text,
notification_by_redirection, notification_by_email, notification_by_sms,
......
vs.variable_symbol, a.id AS aid,
a.balance, a_comment,
a.comments_thread_id AS a_comments_thread_id,
m.type, m.entrance_date, m.leaving_date,
m.type, type_name, m.entrance_date, m.leaving_date,
m.applicant_connected_from, redirect_type,
redirect_type_id, redirect_type_text, whitelisted,
m.notification_by_redirection, m.notification_by_email,
......
IF(m.registration = 1, ?, ?) AS registration,
m.registration AS registrations,
m.type,
IFNULL(t.translated_term, e.value) AS type_name,
IF(mi.id IS NOT NULL, 1, 0) AS membership_interrupt,
IF(mi.id IS NOT NULL, 1, 0) AS interrupt,
m.organization_identifier, m.vat_organization_identifier,

Také k dispozici: Unified diff