Unverified Commit 3d17a84a authored by Alberto Nale's avatar Alberto Nale Committed by GitHub
Browse files

[KNOWAGE-7105][KNOWAGE-7112][KNOWAGE-7113]

Possible bugfix:
KNOWAGE-7105

Bugfixes:
KNOWAGE-7112
KNOWAGE-7113
parents c14e0eef 04b19303
......@@ -11,7 +11,7 @@
</Toolbar>
<div class="p-fluid kn-parameter-sidebar-content kn-alternated-rows">
<div class="p-field p-my-1 p-p-2" v-if="user && (!sessionRole || sessionRole === 'No default role selected')">
<div class="p-field p-my-1 p-p-2" v-if="user && (!sessionRole || sessionRole === this.$t('role.defaultRolePlaceholder'))">
<div class="p-d-flex">
<label class="kn-material-input-label">{{ $t('common.roles') }}</label>
</div>
......
......@@ -79,7 +79,7 @@ export default defineComponent({
let id = this.$router.currentRoute.value.params.id ?? this.parseSelectedMenuItem()
if (id && id !== '/document-browser' && (this.$router.currentRoute.value.name === 'document-browser-document-execution' || this.$router.currentRoute.value.name === 'document-browser-document-details-edit' || this.$router.currentRoute.value.name === 'document-browser')) {
if (id && id !== 'document-browser' && (this.$router.currentRoute.value.name === 'document-browser-document-execution' || this.$router.currentRoute.value.name === 'document-browser-document-details-edit' || this.$router.currentRoute.value.name === 'document-browser')) {
let tempDocument = {} as any
await this.$http.get(process.env.VUE_APP_RESTFUL_SERVICES_PATH + `2.0/documents/${id}`).then((response: AxiosResponse<any>) => (tempDocument = response.data))
const tempItem = {
......
......@@ -182,7 +182,7 @@ export default defineComponent({
},
computed: {
sessionRole(): string {
return this.user.sessionRole !== 'No default role selected' ? this.user.sessionRole : null
return this.user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? this.user.sessionRole : null
},
url(): string {
if (this.document) {
......@@ -215,7 +215,7 @@ export default defineComponent({
})
this.user = (this.$store.state as any).user
this.userRole = this.user.sessionRole !== 'No default role selected' ? this.user.sessionRole : null
this.userRole = this.user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? this.user.sessionRole : null
if (this.propMode !== 'document-execution' && !this.$route.path.includes('olap-designer') && this.$route.name !== 'document-execution') return
......
......@@ -11,6 +11,7 @@
<Checkbox v-else-if="column.field === 'decrypt'" v-model="columnsDecrypt[slotProps.data.uniqueName]" :binary="true" @change="onChange(slotProps.data, 'decrypt')"></Checkbox>
<Checkbox v-else-if="column.field === 'subjectId'" v-model="columnsSubjectId[slotProps.data.uniqueName]" :binary="true" @change="onChange(slotProps.data, 'subjectId')"></Checkbox>
<Dropdown v-else-if="column.field === 'type'" class="kn-material-input" v-model="columnsType[slotProps.data.uniqueName]" :options="metawebAttributesTabDescriptor.typeOptions" @change="onChange(slotProps.data, 'type')" />
<InputText v-else-if="column.field === 'name'" v-model="slotProps.data[slotProps.column.props.field]" class="kn-material-input p-inputtext-sm p-p-2" @blur="$emit('metaUpdated')" />
<span v-else>{{ slotProps.data[slotProps.column.props.field] }}</span>
</div>
</template>
......
<template>
<Accordion v-if="businessModel" :multiple="true" :activeIndex="[0]">
<Accordion v-if="businessModel" :multiple="true" :activeIndex="[0, 1]">
<AccordionTab>
<template #header>
<span>{{ $t('metaweb.physicalModel.misc') }}</span>
......
......@@ -283,7 +283,7 @@ export default defineComponent({
async created() {
this.uniqueID = crypto.randomBytes(16).toString('hex')
this.user = (this.$store.state as any).user
this.userRole = this.user.sessionRole !== 'No default role selected' ? this.user.sessionRole : null
this.userRole = this.user.sessionRole && this.user.sessionRole !== this.$t('role.defaultRolePlaceholder') ? this.user.sessionRole : null
await this.loadPage()
},
methods: {
......
Supports Markdown
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