Commit e532223c authored by akarpov's avatar akarpov
Browse files

NAS-111664: use path_local key from sharing.smb.query for filesystem calls related to share

No related merge requests found
Showing with 4 additions and 3 deletions
+4 -3
......@@ -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;
......
......@@ -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 [
......
......@@ -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({
......
......@@ -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$
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment