Skip to content

Commit 4c9f63e

Browse files
committed
Merge branch 'custom-path-non-replicable' into 'main'
Show path for non-replicable custom items See merge request weblogic-cloud/weblogic-toolkit-ui!295
2 parents 512c63a + 814bf13 commit 4c9f63e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

webui/src/js/utils/wdt-archive-helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ define(['knockout', 'models/wkt-project', 'utils/wkt-logger'],
5252
options.segregatedName = otherArgs.segregatedName;
5353
}
5454

55-
if (archiveEntryTypeName === 'custom' && !!otherArgs.customPath) {
55+
if (otherArgs.customPath) {
5656
options.customPath = otherArgs.customPath;
5757
}
5858
return options;

webui/src/js/viewModels/add-to-archive-selection-dialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
3+
* Copyright (c) 2021, 2024, Oracle and/or its affiliates.
44
* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
55
*/
66
'use strict';
@@ -197,7 +197,7 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, viewHelper, A
197197
return false;
198198
}, this);
199199
this.showEmptyDirField = ko.computed(() => this.archiveEntryTypeSubtype() === 'emptyDir', this);
200-
this.showCustomPathField = ko.computed(() => this.archiveEntryType() === 'custom', this);
200+
this.showCustomPathField = ko.computed(() => Boolean(this.archiveEntry() && this.archiveEntry().pathLabel), this);
201201

202202
this.segregatedNameValidator = {
203203
validate: (value) => {

0 commit comments

Comments
 (0)