Fix global mod priv check and styling for flags page

v1.18.x
Julian Lam 9 years ago
parent 95fb0075c6
commit eb8b6af7fb

@ -10,7 +10,6 @@
@import "./general/navigation";
@import "./manage/categories";
@import "./manage/tags";
@import "./manage/flags";
@import "./manage/groups";
@import "./manage/users";
@import "./appearance/customise";
@ -21,6 +20,8 @@
@import "./advanced/logs";
@import "./settings";
@import "../flags";
@import "./modules/alerts";
@import "./modules/selectable";
@import "./modules/snackbar";

@ -1,3 +1,9 @@
/*
Flags page CSS
- Originally in ACP
- Now available in front-end for global mods as well
*/
.flag-reporters {
font-size: 1.2rem;

@ -69,6 +69,7 @@ module.exports = function(Meta) {
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/textcomplete/jquery.textcomplete.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/flags.less";';
source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/generics.less";';
source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/mixins.less";';

@ -108,7 +108,7 @@ module.exports = function(SocketPosts) {
}
async.waterfall([
function (next) {
user.isAdminOrGlobalModerator(socket.uid, next);
user.isAdminOrGlobalMod(socket.uid, next);
},
function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) {
@ -122,7 +122,7 @@ module.exports = function(SocketPosts) {
SocketPosts.dismissAllFlags = function(socket, data, callback) {
async.waterfall([
function (next) {
user.isAdminOrGlobalModerator(socket.uid, next);
user.isAdminOrGlobalMod(socket.uid, next);
},
function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) {
@ -144,7 +144,7 @@ module.exports = function(SocketPosts) {
async.waterfall([
function (next) {
user.isAdminOrGlobalModerator(socket.uid, next);
user.isAdminOrGlobalMod(socket.uid, next);
},
function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) {

Loading…
Cancel
Save