summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@owncloud.com>2016-04-21 11:19:10 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-11-21 11:29:38 +0100
commitd1233b47b0d96df364a1b5c043cabedc74d5eb01 (patch)
tree314e658c1c5f162ba197811225800f07074ac8c5 /settings/js
parent78f6e29954ed3c0e868d4eccdc95e4b6e8febdea (diff)
downloadnextcloud-server-d1233b47b0d96df364a1b5c043cabedc74d5eb01.tar.gz
nextcloud-server-d1233b47b0d96df364a1b5c043cabedc74d5eb01.zip
use PUT to update user settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/federationsettingsview.js5
-rw-r--r--settings/js/usersettings.js3
2 files changed, 6 insertions, 2 deletions
diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js
index 997f4fef3f1..9921ff64691 100644
--- a/settings/js/federationsettingsview.js
+++ b/settings/js/federationsettingsview.js
@@ -51,7 +51,7 @@
});
}
self.listenTo(self._config, 'change:' + field + 'Scope', function () {
- self._onScopeChanged(field, self._config.get(field + 'Scope'));
+ self._setFieldScopeIcon(field, self._config.get(field + 'Scope'));
});
});
@@ -77,7 +77,8 @@
var pos = ($heading.width() - $heading.find('label').width()) - diff;
scopeMenu.$el.css('right', pos);
- self._onScopeChanged(field, self._config.get(field + 'Scope'));
+ // Restore initial state
+ self._setFieldScopeIcon(field, self._config.get(field + 'Scope'));
});
},
diff --git a/settings/js/usersettings.js b/settings/js/usersettings.js
index d8d089f83de..fcfe556b1d9 100644
--- a/settings/js/usersettings.js
+++ b/settings/js/usersettings.js
@@ -17,6 +17,9 @@
*/
var UserSettings = OC.Backbone.Model.extend({
url: OC.generateUrl('/settings/users/{id}/settings', {id: OC.currentUser}),
+ isNew: function() {
+ return false; // Force PUT on .save()
+ },
parse: function(data) {
if (_.isUndefined(data)) {
return null;