Commit 4c9f63e

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 4c9f63eCopy full SHA for 4c9f63e

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ define(['knockout', 'models/wkt-project', 'utils/wkt-logger'],`
`52`	`52`	`options.segregatedName = otherArgs.segregatedName;`
`53`	`53`	`}`
`54`	`54`
`55`		`- if (archiveEntryTypeName==='custom'&&!!otherArgs.customPath) {`
	`55`	`+ if (otherArgs.customPath) {`
`56`	`56`	`options.customPath = otherArgs.customPath;`
`57`	`57`	`}`
`58`	`58`	`return options;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`* @license`
`3`		`- * Copyright (c) 2021, 2023, Oracle and/or its affiliates.`
	`3`	`+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.`
`4`	`4`	`* Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/`
`5`	`5`	`*/`
`6`	`6`	`'use strict';`
`@@ -197,7 +197,7 @@ function(accUtils, ko, i18n, project, dialogHelper, archiveHelper, viewHelper, A`
`197`	`197`	`return false;`
`198`	`198`	`}, this);`
`199`	`199`	`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);`
`201`	`201`
`202`	`202`	`this.segregatedNameValidator = {`
`203`	`203`	`validate: (value) => {`

Comments

(0)