second pass for #773, blocked for now

This commit is contained in:
Julian Lam
2014-01-21 15:29:34 -05:00
parent bafc8caaf5
commit 53a1474785
2 changed files with 9 additions and 0 deletions

View File

@@ -76,10 +76,12 @@
<!-- ENDIF posts.favourited -->
</button>
</div>
<!-- IF privileges.write -->
<div class="btn-group">
<button class="btn btn-sm btn-default quote" type="button" title="[[topic:quote]]"><i class="fa fa-quote-left"></i></button>
<button class="btn btn-sm btn-primary btn post_reply" type="button">[[topic:reply]] <i class="fa fa-reply"></i></button>
</div>
<!-- ENDIF privileges.write -->
<div class="pull-right">
<div class="btn-group post-tools">
@@ -151,7 +153,9 @@
<div class="thread_active_users active-users inline-block"></div>
</div>
<div class="topic-main-buttons pull-right inline-block">
<!-- IF privileges.write -->
<button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button>
<!-- ENDIF privileges.write -->
<div class="btn-group thread-tools hide">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:thread_tools.title]] <span class="caret"></span></button>
<ul class="dropdown-menu pull-right">
@@ -177,7 +181,9 @@
<div class="loading-indicator" done="0" style="display:none;">
<span class="hidden-xs-inline">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
</div>
<!-- IF privileges.write -->
<button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button>
<!-- ENDIF privileges.write -->
<div class="btn-group thread-tools hide">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:thread_tools.title]] <span class="caret"></span></button>
<ul class="dropdown-menu pull-right">

View File

@@ -166,6 +166,9 @@ var path = require('path'),
if (privileges.read) {
topics.getTopicWithPosts(req.params.id, uid, 0, 10, false, function (err, data) {
if (!err) {
// Send in privilege data as well
data.privileges = privileges;
if (parseInt(data.deleted, 10) === 1 && parseInt(data.expose_tools, 10) === 0) {
return res.json(404, {});
}