Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2343

Přidáno uživatelem David Raška před více než 10 roky(ů)

Upravy:
- refs #866: Datum pripojeni ve filtru u seznamu vsech clenu

Zobrazit rozdíly:

freenetis/branches/1.2/application/controllers/members.php
$filter_form->add('entrance_date')
->type('date');
$filter_form->add('applicant_connected_from')
->label('Connected from')
->type('date');
$filter_form->add('leaving_date')
->type('date');
freenetis/branches/1.2/application/models/member.php
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,
whitelisted, interrupt, 1 AS redirection, 1 AS email, 1 AS sms $select_cloud
applicant_connected_from, whitelisted, interrupt, 1 AS redirection,
1 AS email, 1 AS sms $select_cloud
FROM
(
SELECT
......
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, redirect_type,
m.type, 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,
m.notification_by_sms, interrupt $select_cloud
......
m.organization_identifier, m.vat_organization_identifier,
m.comment, m.entrance_date, m.leaving_date,
m.entrance_fee, m.speed_class_id, m.notification_by_redirection,
m.notification_by_email, m.notification_by_sms
m.notification_by_email, m.notification_by_sms, applicant_connected_from
FROM members m
LEFT JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value = t.original_term AND lang = ?
......
IF(mi.id IS NOT NULL, 1, 0) AS membership_interrupt,
m.organization_identifier, m.vat_organization_identifier,
m.comment, m.entrance_date, m.leaving_date,
m.entrance_fee, m.speed_class_id
m.entrance_fee, m.speed_class_id, m.applicant_connected_from
FROM members m
LEFT JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value = t.original_term AND lang = ?

Také k dispozici: Unified diff