summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-11-25 15:59:32 +0100
committerGitHub <noreply@github.com>2019-11-25 15:59:32 +0100
commit666ad2df14ac61fafcc9fa630787f7049cc86e8e (patch)
tree41432a44c638fc92c2cd39cf6f0d110e690aecf8
parent28fe9aadc998f1e0175e661cb8f83034ba2d228c (diff)
parent49cb882ab49b6a0f7bc09a249c80bf70a57b7f31 (diff)
Merge pull request #3358 from Andy2244/luci-app-cifsd_fix-defaults
luci-app-cifsd: fix defaults (none writeable default shares)
-rw-r--r--applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js17
1 files changed, 12 insertions, 5 deletions
diff --git a/applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js b/applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js
index d536e5bd5..0628936fd 100644
--- a/applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js
+++ b/applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js
@@ -67,7 +67,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'));
@@ -77,24 +78,30 @@ 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, 'inherit_owner', _('Inherit owner'));
o.enabled = 'yes';
o.disabled = 'no';
o.default = 'no';
- s.option(form.Flag, 'hide_dot_files', _('Hide dot files'));
+ o = s.option(form.Flag, 'hide_dot_files', _('Hide dot files'));
+ o.enabled = 'yes';
+ o.disabled = 'no';
+ o.default = 'yes';
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;
return m.render();
}