From 641c82cb21da3167e271045bc88c0db1110845c2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 2 Oct 2019 19:45:36 +0200 Subject: [PATCH] luci-mod-system: crontab.js: use common fs.js class Signed-off-by: Jo-Philipp Wich --- .../resources/view/system/crontab.js | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js index 512f601eb..bb0dd41f9 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js @@ -1,36 +1,19 @@ 'use strict'; -'require rpc'; +'require fs'; return L.view.extend({ - callFileRead: rpc.declare({ - object: 'file', - method: 'read', - params: [ 'path' ], - expect: { data: '' } - }), - - callFileWrite: rpc.declare({ - object: 'file', - method: 'write', - params: [ 'path', 'data' ] - }), - load: function() { - return this.callFileRead('/etc/crontabs/root'); + return L.resolveDefault(fs.read('/etc/crontabs/root'), ''); }, handleSave: function(ev) { var value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n'; - return this.callFileWrite('/etc/crontabs/root', value).then(function(rc) { - if (rc != 0) - throw rpc.getStatusText(rc); - + return fs.write('/etc/crontabs/root', value).then(function(rc) { document.querySelector('textarea').value = value; L.ui.addNotification(null, E('p', _('Contents have been saved.')), 'info'); - }).catch(function(e) { - L.ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e))); + L.ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message))); }); }, -- 2.25.1