Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2332

Přidáno uživatelem Ondřej Fibich před asi 10 roky(ů)

Opravy:
- vyhledavani nebylo internacionalizovano u enum typu (v SQL dotazech bylo natvrdo 'cs')

Zobrazit rozdíly:

freenetis/trunk/application/models/search.php
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
".$sql_limit, array
(
" (" . __('I') . ")",
Config::get('lang'),
"%$keyword%"
));
}
......
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
".$sql_limit, array
(
" (" . __('I') . ")",
Config::get('lang'),
"$keyword%"
));
}
......
JOIN enum_types e ON m.type = e.id
LEFT JOIN accounts a ON a.member_id = m.id
LEFT JOIN variable_symbols vs ON vs.account_id = a.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
(
__('Variable symbol') . ": ",
" (" . __('I') . ")",
Config::get('lang'),
"$keyword%"
));
}
......
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
(
__('Comment') . ": ",
" (" . __('I') . ")",
Config::get('lang'),
"%$keyword%"
));
}
......
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE CONCAT(tw.town, IF(tw.quarter IS NOT NULL, CONCAT(' ', tw.quarter), '')) LIKE ? COLLATE utf8_general_ci
ORDER BY ABS(LENGTH(value) - " . mb_strlen($keyword) . ")
".$sql_limit, " (" . __('I') . ")", "%$keyword%");
".$sql_limit, " (" . __('I') . ")", Config::get('lang'), "%$keyword%");
}
/**
......
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE CONCAT(s.street, ' ',ap.street_number) LIKE ? COLLATE utf8_general_ci
ORDER BY ABS(LENGTH(value) - " . mb_strlen($keyword) . ")
".$sql_limit, " (" . __('I') . ")", "%$keyword%");
".$sql_limit, " (" . __('I') . ")", Config::get('lang'), "%$keyword%");
}
/**
......
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
LEFT JOIN members_fees mf ON mi.members_fee_id = mf.id AND (mf.activation_date < CURDATE() AND mf.deactivation_date > CURDATE())
WHERE ap.street_number LIKE ? COLLATE utf8_general_ci
ORDER BY ABS(LENGTH(value) - " . mb_strlen($keyword) . ")
".$sql_limit, " (" . __('I') . ")", "$keyword%");
".$sql_limit, " (" . __('I') . ")", Config::get('lang'), "$keyword%");
}
/**
......
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
".$sql_limit, array
(
" (" . __('I') . ")",
Config::get('lang'),
"$keyword%"
));
}
......
CONCAT(IFNULL(t.translated_term,e.value),' ',m.name,IF(mf.id IS NOT NULL,?,'')) AS return_value,
'members/show/' AS link FROM members m
JOIN enum_types e ON m.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
JOIN towns tw ON ap.town_id = tw.id
......
".$sql_limit, array
(
" (" . __('I') . ")",
Config::get('lang'),
"$keyword%"
));
}
......
LEFT JOIN users_contacts uc ON u.id = uc.user_id
LEFT JOIN contacts c ON uc.contact_id = c.id
LEFT JOIN enum_types e ON c.type = e.id
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = 'cs'
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
WHERE c.value LIKE ? COLLATE utf8_general_ci
ORDER BY ABS(LENGTH(c.value) - " . mb_strlen($keyword) . ")
".$sql_limit, __('User') . ": ", "%$keyword%");
".$sql_limit, __('User') . ": ", Config::get('lang'), "%$keyword%");
}
/**

Také k dispozici: Unified diff