Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
truenas-rk3588
webui
Commits
e532223c
Commit
e532223c
authored
3 years ago
by
akarpov
Browse files
Options
Download
Email Patches
Plain Diff
NAS-111664: use path_local key from sharing.smb.query for filesystem calls related to share
parent
c9574092
NAS-111664
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/app/interfaces/smb-share.interface.ts
+1
-0
src/app/interfaces/smb-share.interface.ts
src/app/pages/sharing/smb/smb-list/smb-list.component.ts
+1
-1
src/app/pages/sharing/smb/smb-list/smb-list.component.ts
src/app/pages/storage/volumes/datasets/dataset-form/dataset-form.component.ts
+1
-1
...e/volumes/datasets/dataset-form/dataset-form.component.ts
src/app/pages/storage/volumes/permissions/containers/dataset-acl-editor/dataset-acl-editor.component.ts
+1
-1
...ainers/dataset-acl-editor/dataset-acl-editor.component.ts
with
4 additions
and
3 deletions
+4
-3
src/app/interfaces/smb-share.interface.ts
View file @
e532223c
...
...
@@ -20,6 +20,7 @@ export interface SmbShare {
name
:
string
;
path
:
string
;
path_suffix
:
string
;
path_local
:
string
;
purpose
:
string
;
// Possibly enum: "DEFAULT_SHARE"
recyclebin
:
boolean
;
ro
:
boolean
;
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/sharing/smb/smb-list/smb-list.component.ts
View file @
e532223c
...
...
@@ -89,7 +89,7 @@ export class SMBListComponent implements EntityTableConfig {
}
getActions
(
row
:
SmbShare
):
EntityTableAction
[]
{
const
rowName
=
row
.
path
.
replace
(
'
/mnt/
'
,
''
);
const
rowName
=
row
.
cluster_volname
?
row
.
path_local
:
row
.
path
.
replace
(
'
/mnt/
'
,
''
);
const
poolName
=
rowName
.
split
(
'
/
'
)[
0
];
const
optionDisabled
=
!
rowName
.
includes
(
'
/
'
);
return
[
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/storage/volumes/datasets/dataset-form/dataset-form.component.ts
View file @
e532223c
...
...
@@ -1568,7 +1568,7 @@ export class DatasetFormComponent implements FormConfiguration {
return
operation$
.
pipe
(
untilDestroyed
(
this
)).
subscribe
((
restPostResp
)
=>
{
this
.
loader
.
close
();
this
.
modalService
.
close
(
'
slide-in-form
'
);
const
parentPath
=
`/mnt/
${
this
.
parent
}
`
;
const
parentPath
=
this
.
parent
.
includes
(
'
CLUSTER:
'
)
?
this
.
parent
:
`/mnt/
${
this
.
parent
}
`
;
this
.
ws
.
call
(
'
filesystem.acl_is_trivial
'
,
[
parentPath
]).
pipe
(
untilDestroyed
(
this
)).
subscribe
((
res
)
=>
{
if
(
!
res
)
{
this
.
dialogService
.
confirm
({
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/storage/volumes/permissions/containers/dataset-acl-editor/dataset-acl-editor.component.ts
View file @
e532223c
...
...
@@ -93,7 +93,7 @@ export class DatasetAclEditorComponent implements OnInit {
ngOnInit
():
void
{
this
.
datasetPath
=
this
.
route
.
snapshot
.
params
[
'
path
'
];
this
.
fullDatasetPath
=
`/mnt/
${
this
.
datasetPath
}
`
;
this
.
fullDatasetPath
=
this
.
datasetPath
.
includes
(
'
CLUSTER:
'
)
?
this
.
datasetPath
:
`/mnt/
${
this
.
datasetPath
}
`
;
this
.
store
.
loadAcl
(
this
.
fullDatasetPath
);
this
.
store
.
state$
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help