Projekt

Obecné

Profil

« Předchozí | Další » 

Revize c0711b4d

Přidáno uživatelem Ondřej Fibich před téměř 9 roky(ů)

refs #1029: Filter for "added by" field in members table

Zobrazit rozdíly:

application/controllers/members.php
->label('Login name')
->table('u')
->callback('json/user_login');
$filter_form->add('login')
->label('Added by (login)')
->table('ua')
->callback('json/user_login');
return $filter_form;
}
application/i18n/cs_CZ/texts.php
'add work' => 'Přidat práci',
'added' => 'Přidáno',
'added by' => 'Přidal',
'added by (login)' => 'Přidal (přihl. jméno)',
'additional demolition of membership fees' => 'Dodatečné stržení členských příspěvků',
'additional payment for member fees before membership' => 'Doplatek členských přispěvků v době kdy nebyl uživatel členem',
'another contact information' => 'Další kontaktní informace',
application/models/member.php
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,
m.user_id AS added_by_user_id
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 = ?
......
) mi ON mi.member_id = m.id
) AS m
LEFT JOIN users u ON u.member_id = m.id
LEFT JOIN users ua ON ua.id = m.added_by_user_id
LEFT JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
LEFT JOIN towns t ON ap.town_id = t.id
......
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.user_id AS added_by_user_id
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 = ?
......
) mi ON mi.member_id = m.id
) AS m
LEFT JOIN users u ON u.member_id = m.id
LEFT JOIN users ua ON ua.id = m.added_by_user_id
LEFT JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
LEFT JOIN towns t ON ap.town_id = t.id

Také k dispozici: Unified diff