Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

show link to pool in history comments #634

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

show link to pool in history comments #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions lib/lib_history.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,24 @@ function main_history($sentence_id, $set_id = 0, $skip = 0, $maa = 0) {
$res = sql_query("SELECT tr.set_id, st.sent_id, s.timestamp, s.comment, u.user_shown_name AS user_name FROM tf_revisions tr LEFT JOIN rev_sets s ON (tr.set_id=s.set_id) LEFT JOIN users u ON (s.user_id=u.user_id) RIGHT JOIN tokens tf ON (tr.tf_id = tf.tf_id) RIGHT JOIN sentences st ON (tf.sent_id = st.sent_id) ".($maa ? "WHERE tr.set_id IN (SELECT set_id FROM rev_sets WHERE comment LIKE '% merged %' OR comment LIKE '% split %') AND " : 'WHERE ').($set_id?"tr.set_id=$set_id GROUP BY st.sent_id":"st.sent_id=$sentence_id GROUP BY tr.set_id")." ORDER BY tr.rev_id DESC LIMIT $skip,20");
while ($r = sql_fetch_array($res)) {
$out['sets'][] = array(
'set_id' => $r['set_id'],
'user_name' => $r['user_name'],
'timestamp' => $r['timestamp'],
'sent_cnt' => isset($r['cnt']) ? $r['cnt'] : 0,
'sent_id' => isset($r['sent_id']) ? $r['sent_id'] : 0,
'comment' => $r['comment']
'set_id' => $r['set_id'],
'user_name' => $r['user_name'],
'timestamp' => $r['timestamp'],
'sent_cnt' => isset($r['cnt']) ? $r['cnt'] : 0,
'sent_id' => isset($r['sent_id']) ? $r['sent_id'] : 0,
'comment_html' => history_get_comment_html($r['comment']),
'comment' => $r['comment']
);
}
}

return $out;
}
function history_get_comment_html($comment) {
$pattern = array('/Merge data from annotation pool #(\d+)/i');
$replacement = array('Merge data from annotation pool <a href="/pools.php?act=samples&amp;pool_id=$1">#$1</a>');
return preg_replace ($pattern, $replacement, $comment);
}
function dict_history($lemma_id, $skip = 0) {
$out = array();
if (!$lemma_id) {
Expand Down
9 changes: 8 additions & 1 deletion templates/history.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@
<td><a href="sentence.php?id={$h.sent_id}">Предложение {$h.sent_id}</a></td>
<td><a href="diff.php?sent_id={$h.sent_id}&amp;set_id={$h.set_id}">Изменения</a></td>
{/if}
<td>{if $h.comment}{$h.comment|htmlspecialchars}{else}(без комментария){/if}</td>
<td>{if $h.comment_html}
{$h.comment_html}
{elseif $h.comment}
{$h.comment|htmlspecialchars}
{else}
(без комментария)
{/if}
</td>
</tr>
{/foreach}
</table>
Expand Down