The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'appconfig_ui' of github.com:cryptpad/cryptpad into appconfig_ui

Browse Source
This commit is contained in:
David Benque 2024-06-19 16:59:00 +01:00
commit 0072aaa8a5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commands/admin-rpc.js
View File

@ -1012,7 +1012,7 @@ var uploadLogo = (Env, Server, cb, data, unsafeKey) => {
var changeColor = (Env, Server, cb, data, unsafeKey) => {
const args = Array.isArray(data) && data[1];
if (!args || typeof(args) !== 'object') { return void cb("EINVAL"); }
let color = args.color || args.selectedColor;
let color = args.color;
adminDecree(Env, null, function (err) {
if (err) { return void cb(err); }
Env.flushCache();

2
www/install/onboardscreen.js
View File

@ -168,7 +168,7 @@ define([
let hex = Util.rgbToHex(rgb);
selectorColor = hex;
// XXX Save only at the end
sendAdminRpc('CHANGE_COLOR', {selectedColor}, function (e, response) {
sendAdminRpc('CHANGE_COLOR', {color:selectedColor}, function (e, response) {
if (e || response.error) {
UI.warn(Messages.error);
console.error(e, response);