Revize 985
Přidáno uživatelem Michal Kliment před více než 13 roky(ů)
| freenetis/trunk/kohana/application/models/job.php | ||
|---|---|---|
|
SELECT c.*, CONCAT(u.surname," ",u.name) AS user FROM comments c
|
||
|
LEFT JOIN users u ON c.user_id = u.id
|
||
|
ORDER BY datetime DESC
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.user_id
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.comments_thread_id
|
||
|
) AS comments,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(comment SEPARATOR ", \n\n") FROM
|
||
| ... | ... | |
|
SELECT c.*, CONCAT(u.surname," ",u.name) AS user FROM comments c
|
||
|
LEFT JOIN users u ON c.user_id = u.id
|
||
|
ORDER BY datetime DESC
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.user_id
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.comments_thread_id
|
||
|
) AS comments,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(comment SEPARATOR ", \n\n") FROM
|
||
| ... | ... | |
|
SELECT c.*, CONCAT(u.surname," ",u.name) AS user FROM comments c
|
||
|
LEFT JOIN users u ON c.user_id = u.id
|
||
|
ORDER BY datetime DESC
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.user_id
|
||
|
) AS c WHERE c.comments_thread_id = j.comments_thread_id GROUP BY c.comments_thread_id
|
||
|
) AS comments,
|
||
|
(
|
||
|
SELECT GROUP_CONCAT(comment SEPARATOR ", \n\n") FROM
|
||
| freenetis/trunk/kohana/application/controllers/works.php | ||
|---|---|---|
|
$pending_works_grid->field('date')->label(url_lang::lang('texts.Date'));
|
||
|
$pending_works_grid->field('hours')->label(url_lang::lang('texts.Hours'));
|
||
|
$pending_works_grid->field('km')->label(url_lang::lang('texts.Km'));
|
||
|
$pending_works_grid->callback_field('suggest_amount')->label(url_lang::lang('texts.Suggest amount'))->callback('Works_Controller::suggest_amount');
|
||
|
$pending_works_grid->callback_field('approval_state')->label(url_lang::lang('texts.State'))->help(help::hint('approval_state'))->callback('callback::vote_state_field');
|
||
|
$pending_works_grid->callback_field('comments_count')->label(url_lang::lang('texts.comments'))->callback('callback::comments_field');
|
||
|
|
||
Také k dispozici: Unified diff
Merge z testingu do trunku: Oprava chyby na zobrazeni seznamu vsech praci.