Merge pull request #873 from visuddhinanda/laravel

:bug: 编辑界面展开更多译文里面的编辑弹出菜单无法显示已经修改

public/app/term/term.css

@@ -751,6 +751,11 @@ pw {
     left:6.2em;
     margin-top: calc(-2.1em - 8px);
 }
+
+.translation>.sent_tran_inner:hover>.tool_bar > .right {
+    display: block;
+}
+
 .sent_tran.commentary>.sent_tran_inner{
     padding-top: 2.2em;
 }

public/app/usent/get.php

@@ -85,7 +85,7 @@ if (isset($_GET["sentences"])) {
 					sent.strlen,
 					sent.modify_time,
                     channel.type
-					FROM "._TABLE_SENTENCE_. " as sent LEFT JOIN "._TABLE_CHANNEL_." as channel ON sent.channel_uid=channel.uid  WHERE (channel.type= ? AND sent.book_id = ?  AND sent.paragraph = ? AND sent.word_start = ? AND sent.word_end = ? and sent.strlen >0 and (sent.status = 30 {$channel_query} ) ) order by sent.modify_time DESC  ";
+					FROM "._TABLE_SENTENCE_. " as sent LEFT JOIN "._TABLE_CHANNEL_." as channel ON uuid(sent.channel_uid)=channel.uid  WHERE (channel.type= ? AND sent.book_id = ?  AND sent.paragraph = ? AND sent.word_start = ? AND sent.word_end = ? and sent.strlen >0 and (sent.status = 30 {$channel_query} ) ) order by sent.modify_time DESC  ";
     $stmt = $dbh->prepare($query);
     $parm = array($type,$book, $para, $begin, $end);
     $parm = array_merge_recursive($parm, $channal_list);