web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix set team metadata using wrong data

Browse Source
This commit is contained in:
yflory
2019-09-23 10:51:35 +02:00
parent 45d37acc84
commit 977198122f
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
www/team/inner.js
View File

@@ -552,19 +552,21 @@ define([
var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide(); var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved}).hide();
var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide(); var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'}).hide();
var md;
var todo = function () { var todo = function () {
var newName = $input.val(); var newName = $input.val();
if (newName === md.name) { return; }
md.name = newName;
$spinner.show(); $spinner.show();
APP.module.execCommand('SET_TEAM_METADATA', { APP.module.execCommand('GET_TEAM_METADATA', {
teamId: APP.team, teamId: APP.team
metadata: md }, function (obj) {
}, function () { if (obj && obj.error) { return void UI.warn(Messages.error); }
$spinner.hide(); obj.name = newName;
$ok.show(); APP.module.execCommand('SET_TEAM_METADATA', {
teamId: APP.team,
metadata: obj
}, function () {
$spinner.hide();
$ok.show();
});
}); });
}; };
@@ -574,7 +576,6 @@ define([
if (obj && obj.error) { if (obj && obj.error) {
return void UI.warn(Messages.error); return void UI.warn(Messages.error);
} }
md = obj;
$input.val(obj.name); $input.val(obj.name);
$input.on('keyup', function (e) { $input.on('keyup', function (e) {
if ($input.val() !== obj.name) { $ok.hide(); } if ($input.val() !== obj.name) { $ok.hide(); }
@@ -594,16 +595,20 @@ define([
// Upload // Upload
var avatar = h('div.cp-team-avatar.cp-avatar'); var avatar = h('div.cp-team-avatar.cp-avatar');
var $avatar = $(avatar); var $avatar = $(avatar);
var md;
var data = UIElements.addAvatar(common, function (ev, data) { var data = UIElements.addAvatar(common, function (ev, data) {
if (!data.url) { return void UI.warn(Messages.error); } if (!data.url) { return void UI.warn(Messages.error); }
md.avatar = data.url; APP.module.execCommand('GET_TEAM_METADATA', {
APP.module.execCommand('SET_TEAM_METADATA', { teamId: APP.team
teamId: APP.team, }, function (obj) {
metadata: md if (obj && obj.error) { return void UI.warn(Messages.error); }
}, function () { obj.avatar = data.url;
$avatar.empty(); APP.module.execCommand('SET_TEAM_METADATA', {
common.displayAvatar($avatar, data.url); teamId: APP.team,
metadata: obj
}, function () {
$avatar.empty();
common.displayAvatar($avatar, data.url);
});
}); });
}); });
var $upButton = common.createButton('upload', false, data); var $upButton = common.createButton('upload', false, data);
@@ -617,7 +622,6 @@ define([
return void UI.warn(Messages.error); return void UI.warn(Messages.error);
} }
var val = obj.avatar; var val = obj.avatar;
md = obj;
if (!val) { if (!val) {
var $img = $('<img>', { var $img = $('<img>', {
src: '/customize/images/avatar.png', src: '/customize/images/avatar.png',