more fixes

v1.18.x
Baris Usakli 8 years ago
parent 242dc41aca
commit 025709499c

@ -18,7 +18,6 @@ define('admin/manage/category', [
}); });
$('#category-selector').on('change', function () { $('#category-selector').on('change', function () {
var val = $(this).val();
ajaxify.go('admin/manage/categories/' + $(this).val() + window.location.hash); ajaxify.go('admin/manage/categories/' + $(this).val() + window.location.hash);
}); });

@ -4,7 +4,7 @@ define('admin/manage/privileges', [
'autocomplete', 'autocomplete',
'translator', 'translator',
'benchpress', 'benchpress',
'categorySelector' 'categorySelector',
], function (autocomplete, translator, Benchpress, categorySelector) { ], function (autocomplete, translator, Benchpress, categorySelector) {
var Privileges = {}; var Privileges = {};
@ -62,7 +62,7 @@ define('admin/manage/privileges', [
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
var tpl = cid ? 'admin/partials/categories/privileges' : 'admin/manage/privileges'; var tpl = cid ? 'admin/partials/categories/privileges' : 'admin/partials/global/privileges';
Benchpress.parse(tpl, { Benchpress.parse(tpl, {
privileges: privileges, privileges: privileges,
}, function (html) { }, function (html) {

@ -3,7 +3,6 @@
var async = require('async'); var async = require('async');
var categories = require('../../categories'); var categories = require('../../categories');
var privileges = require('../../privileges');
var analytics = require('../../analytics'); var analytics = require('../../analytics');
var plugins = require('../../plugins'); var plugins = require('../../plugins');
var translator = require('../../translator'); var translator = require('../../translator');

@ -13,7 +13,7 @@ privilegesController.get = function (req, res, callback) {
function (next) { function (next) {
async.parallel({ async.parallel({
privileges: function (next) { privileges: function (next) {
if (!cid) { if (!cid) {
privileges.global.list(next); privileges.global.list(next);
} else { } else {
privileges.categories.list(cid, next); privileges.categories.list(cid, next);
@ -23,7 +23,6 @@ privilegesController.get = function (req, res, callback) {
}, next); }, next);
}, },
function (data) { function (data) {
data.allCategories.forEach(function (category) { data.allCategories.forEach(function (category) {
if (category) { if (category) {
category.selected = parseInt(category.cid, 10) === parseInt(cid, 10); category.selected = parseInt(category.cid, 10) === parseInt(cid, 10);

@ -353,6 +353,11 @@ function createGlobalModeratorsGroup(next) {
], next); ], next);
} }
function giveGlobalPrivileges(next) {
var groups = require('./groups');
groups.join('cid:0:privileges:groups:chat', 'registered-users', next);
}
function createCategories(next) { function createCategories(next) {
var Categories = require('./categories'); var Categories = require('./categories');
@ -498,6 +503,7 @@ install.setup = function (callback) {
createCategories, createCategories,
createAdministrator, createAdministrator,
createGlobalModeratorsGroup, createGlobalModeratorsGroup,
giveGlobalPrivileges,
createMenuItems, createMenuItems,
createWelcomePost, createWelcomePost,
enableDefaultPlugins, enableDefaultPlugins,

@ -2,10 +2,8 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var _ = require('lodash');
var user = require('../user'); var user = require('../user');
var groups = require('../groups');
var helpers = require('./helpers'); var helpers = require('./helpers');
var plugins = require('../plugins'); var plugins = require('../plugins');
@ -65,6 +63,4 @@ module.exports = function (privileges) {
}, },
], callback); ], callback);
}; };
}; };

@ -220,4 +220,4 @@ helpers.getGroupPrivileges = function (cid, hookName, groupPrivilegeList, callba
}, next); }, next);
}, },
], callback); ], callback);
}; };

@ -7,6 +7,6 @@ module.exports = {
name: 'Give chat privilege to registered-users', name: 'Give chat privilege to registered-users',
timestamp: Date.UTC(2017, 11, 18), timestamp: Date.UTC(2017, 11, 18),
method: function (callback) { method: function (callback) {
groups.join('cid:0:privileges:group:chat', 'registered-users', callback); groups.join('cid:0:privileges:groups:chat', 'registered-users', callback);
}, },
}; };

Loading…
Cancel
Save