summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-11-25 15:59:09 +0100
committerGitHub <noreply@github.com>2019-11-25 15:59:09 +0100
commit28fe9aadc998f1e0175e661cb8f83034ba2d228c (patch)
tree9cc21444821a59996f9c3e74851f280dc121ccc6 /applications
parent5e1253f4f7032e7bdbb106222f2bc2f0760bcb6d (diff)
parent5c2fa35981fc6f6c4952697b1d6b1c0274620bd9 (diff)
Merge pull request #3360 from Andy2244/luci-app-samba4_fix-defaults
luci-app-samba4: fix defaults (none writeable default shares)
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js b/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
index 4431eb889d..7aface6eca 100644
--- a/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
+++ b/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
@@ -86,7 +86,8 @@ return L.view.extend({
o = s.option(form.Flag, 'read_only', _('Read-only'));
o.enabled = 'yes';
o.disabled = 'no';
- o.default = 'no';
+ o.default = 'no'; // smb.conf default is 'yes'
+ o.rmempty = false;
s.option(form.Flag, 'force_root', _('Force Root'));
@@ -96,7 +97,8 @@ return L.view.extend({
o = s.option(form.Flag, 'guest_ok', _('Allow guests'));
o.enabled = 'yes';
o.disabled = 'no';
- o.default = 'Yes';
+ o.default = 'yes'; // smb.conf default is 'no'
+ o.rmempty = false;
o = s.option(form.Flag, 'guest_only', _('Guests only'));
o.enabled = 'yes';
@@ -109,14 +111,16 @@ return L.view.extend({
o.default = 'no';
o = s.option(form.Value, 'create_mask', _('Create mask'));
- o.rmempty = true;
o.maxlength = 4;
+ o.default = '0666'; // smb.conf default is '0744'
o.placeholder = '0666';
+ o.rmempty = false;
o = s.option(form.Value, 'dir_mask', _('Directory mask'));
- o.rmempty = true;
o.maxlength = 4;
+ o.default = '0777'; // smb.conf default is '0755'
o.placeholder = '0777';
+ o.rmempty = false;
o = s.option(form.Value, 'vfs_objects', _('Vfs objects'));
o.rmempty = true;