baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-26 11:48:41 +00:00
Code Issues Actions Packages Releases Activity

feat(web/problem/solution): hidden solutions
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Baoshuo Ren 2022-10-08 10:06:44 +08:00
parent a97a05553b
commit f0974dbe82
Signed by: baoshuo
GPG Key ID: 00CB9680AB29F51A
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/app/controllers/problem_solutions.php
View File

@ -95,7 +95,7 @@ EOD;
return '博客不存在'; return '博客不存在';
} }
if (!isSuperUser($myUser)) { if (!hasProblemPermission($myUser, $problem)) {
if ($blog['poster'] != $myUser['username']) { if ($blog['poster'] != $myUser['username']) {
if ($blog['is_hidden']) { if ($blog['is_hidden']) {
return '博客不存在'; return '博客不存在';
@ -103,11 +103,11 @@ EOD;
return '只能提交本人撰写的博客'; return '只能提交本人撰写的博客';
} }
}
if ($blog['is_hidden']) { if ($blog['is_hidden']) {
return '只能提交公开的博客'; return '只能提交公开的博客';
} }
}
if (querySolution($problem['id'], $x)) { if (querySolution($problem['id'], $x)) {
return '该题解已提交'; return '该题解已提交';
@ -135,9 +135,12 @@ EOD;
} }
$pag_config = array('page_len' => 5); $pag_config = array('page_len' => 5);
$pag_config['col_names'] = array('blog_id', 'content', 'poster', 'post_time', 'zan'); $pag_config['col_names'] = array('blog_id', 'content', 'poster', 'post_time', 'zan', 'is_hidden');
$pag_config['table_name'] = "problems_solutions inner join blogs on problems_solutions.blog_id = blogs.id"; $pag_config['table_name'] = "problems_solutions inner join blogs on problems_solutions.blog_id = blogs.id";
$pag_config['cond'] = "problem_id = {$problem['id']} and is_hidden = 0"; $pag_config['cond'] = "problem_id = {$problem['id']}";
if (!hasProblemPermission($myUser, $problem)) {
$pag_config['cond'] .= " and (is_hidden = 0 or poster = '{$myUser['username']}')";
}
$pag_config['tail'] = "order by zan desc, post_time desc, id asc"; $pag_config['tail'] = "order by zan desc, post_time desc, id asc";
$pag = new Paginator($pag_config); $pag = new Paginator($pag_config);
@ -186,19 +189,34 @@ EOD;
<?= UOJLocale::get('post time') ?>: <?= UOJLocale::get('post time') ?>:
<time class="text-muted"><?= $row['post_time'] ?></time> <time class="text-muted"><?= $row['post_time'] ?></time>
</span> </span>
<?php if ($row['is_hidden']): ?>
<span class="badge text-bg-danger ms-2">隐藏</span>
<?php endif ?>
</div> </div>
<div class="markdown-body"> <div class="markdown-body">
<?= $row['content'] ?> <?= $row['content'] ?>
</div> </div>
<div class="mt-3 text-end"> <ul class="mt-3 text-end list-inline">
<?php if (isset($row['removeForm'])): ?> <?php if (isset($row['removeForm'])): ?>
<li class="list-inline-item">
<?php $row['removeForm']->printHTML(); ?> <?php $row['removeForm']->printHTML(); ?>
</li>
<?php endif ?> <?php endif ?>
<?php if (Auth::check() && (isSuperUser(Auth::user()) || Auth::id() == $blog['poster'])): ?>
<li class="list-inline-item">
<a class="text-decoration-none" href="<?=HTML::blog_url($blog['poster'], '/blog/'.$row['blog_id'].'/write')?>">
修改
</a>
</li>
<?php endif ?>
<li class="list-inline-item">
<a class="text-decoration-none" href="/blogs/<?= $row['blog_id'] ?>">在 Ta 的博客上查看</a> <a class="text-decoration-none" href="/blogs/<?= $row['blog_id'] ?>">在 Ta 的博客上查看</a>
<li class="list-inline-item">
<?= getClickZanBlock('B', $row['blog_id'], $row['zan']) ?> <?= getClickZanBlock('B', $row['blog_id'], $row['zan']) ?>
</div> </li>
</ul>
</li> </li>
<?php endforeach ?> <?php endforeach ?>
<?php if ($pag->isEmpty()): ?> <?php if ($pag->isEmpty()): ?>