hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix group name

Browse Source
v1.18.x
Barış Soner Uşaklı 10 years ago
parent 2b2dceb28b
commit d225951027
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
public/src/admin/manage/group.js
Unescape Escape View File

@ -18,7 +18,7 @@ define('admin/manage/group', [
searchDelay; searchDelay;
var groupName = ajaxify.data.group.name; var groupName = decodeURIComponent(ajaxify.data.group.nameEncoded);
changeGroupUserTitle.keyup(function() { changeGroupUserTitle.keyup(function() {
groupLabelPreview.text(changeGroupUserTitle.val()); groupLabelPreview.text(changeGroupUserTitle.val());

29
public/src/client/groups/details.js
Unescape Escape View File

@ -7,11 +7,14 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
}; };
var searchInterval; var searchInterval;
var groupName;
Details.init = function() { Details.init = function() {
var detailsPage = components.get('groups/container'), var detailsPage = components.get('groups/container'),
settingsFormEl = detailsPage.find('form'); settingsFormEl = detailsPage.find('form');
groupName = decodeURIComponent(ajaxify.data.group.nameEncoded);
if (ajaxify.data.group.isOwner) { if (ajaxify.data.group.isOwner) {
Details.prepareSettings(); Details.prepareSettings();
Details.initialiseCover(); Details.initialiseCover();
@ -34,7 +37,7 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
case 'toggleOwnership': case 'toggleOwnership':
socket.emit('groups.' + (isOwner ? 'rescind' : 'grant'), { socket.emit('groups.' + (isOwner ? 'rescind' : 'grant'), {
toUid: uid, toUid: uid,
groupName: ajaxify.data.group.name groupName: groupName
}, function(err) { }, function(err) {
if (!err) { if (!err) {
ownerFlagEl.toggleClass('invisible'); ownerFlagEl.toggleClass('invisible');
@ -47,7 +50,7 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
case 'kick': case 'kick':
socket.emit('groups.kick', { socket.emit('groups.kick', {
uid: uid, uid: uid,
groupName: ajaxify.data.group.name groupName: groupName
}, function(err) { }, function(err) {
if (!err) { if (!err) {
userRow.slideUp().remove(); userRow.slideUp().remove();
@ -75,7 +78,7 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
case 'rejectAll': case 'rejectAll':
socket.emit('groups.' + action, { socket.emit('groups.' + action, {
toUid: uid, toUid: uid,
groupName: ajaxify.data.group.name groupName: groupName
}, function(err) { }, function(err) {
if (!err) { if (!err) {
ajaxify.refresh(); ajaxify.refresh();
@ -156,7 +159,7 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
}); });
socket.emit('groups.update', { socket.emit('groups.update', {
groupName: ajaxify.data.group.name, groupName: groupName,
values: settings values: settings
}, function(err) { }, function(err) {
if (err) { if (err) {
@ -178,15 +181,15 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
}; };
Details.deleteGroup = function() { Details.deleteGroup = function() {
bootbox.confirm('Are you sure you want to delete the group: ' + utils.escapeHTML(ajaxify.data.group.name), function(confirm) { bootbox.confirm('Are you sure you want to delete the group: ' + utils.escapeHTML(groupName), function(confirm) {
if (confirm) { if (confirm) {
bootbox.prompt('Please enter the name of this group in order to delete it:', function(response) { bootbox.prompt('Please enter the name of this group in order to delete it:', function(response) {
if (response === ajaxify.data.group.name) { if (response === groupName) {
socket.emit('groups.delete', { socket.emit('groups.delete', {
groupName: ajaxify.data.group.name groupName: groupName
}, function(err) { }, function(err) {
if (!err) { if (!err) {
app.alertSuccess('[[groups:event.deleted, ' + utils.escapeHTML(ajaxify.data.group.name) + ']]'); app.alertSuccess('[[groups:event.deleted, ' + utils.escapeHTML(groupName) + ']]');
ajaxify.go('groups'); ajaxify.go('groups');
} else { } else {
app.alertError(err.message); app.alertError(err.message);
@ -218,7 +221,7 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
Details.cover.load = function() { Details.cover.load = function() {
socket.emit('groups.cover.get', { socket.emit('groups.cover.get', {
groupName: ajaxify.data.group.name groupName: groupName
}, function(err, data) { }, function(err, data) {
if (!err) { if (!err) {
var coverEl = components.get('groups/cover'); var coverEl = components.get('groups/cover');
@ -267,7 +270,7 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
coverEl.addClass('saving'); coverEl.addClass('saving');
socket.emit('groups.cover.update', { socket.emit('groups.cover.update', {
groupName: ajaxify.data.group.name, groupName: groupName,
imageData: Details.cover.newCover || undefined, imageData: Details.cover.newCover || undefined,
position: components.get('groups/cover').css('background-position') position: components.get('groups/cover').css('background-position')
}, function(err) { }, function(err) {
@ -294,7 +297,7 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
} }
searchInterval = setTimeout(function() { searchInterval = setTimeout(function() {
socket.emit('groups.searchMembers', {groupName: ajaxify.data.group.name, query: query}, function(err, results) { socket.emit('groups.searchMembers', {groupName: groupName, query: query}, function(err, results) {
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
@ -324,13 +327,15 @@ define('forum/groups/details', ['iconSelect', 'components', 'forum/infinitescrol
} }
function loadMoreMembers() { function loadMoreMembers() {
var members = $('[component="groups/members"]'); var members = $('[component="groups/members"]');
if (members.attr('loading')) { if (members.attr('loading')) {
return; return;
} }
members.attr('loading', 1); members.attr('loading', 1);
socket.emit('groups.loadMoreMembers', { socket.emit('groups.loadMoreMembers', {
groupName: ajaxify.data.group.name, groupName: groupName,
after: members.attr('data-nextstart') after: members.attr('data-nextstart')
}, function(err, data) { }, function(err, data) {
if (err) { if (err) {

Write Preview
Loading…
Cancel
Save