Skip to content

Commit c67f49e

Browse files
Merge branch '3735_menu_entry' into 'develop'
date dependency menu entry visibility See merge request baserow/baserow!3774
2 parents 384646a + 36401b8 commit c67f49e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

enterprise/web-frontend/modules/baserow_enterprise/components/dateDependency/DateDependencyMenuItem.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
22
<div
3-
v-if="showEntry && featureFlagEnabled && (hasPermission || !featureEnabled)"
3+
v-if="showEntry && featureFlagEnabled && (hasPermission || !hasFeature)"
44
class="context__menu-item"
55
>
66
<div>
77
<a
88
class="context__menu-item-link"
99
@click="
1010
() => {
11-
if (featureEnabled) {
11+
if (hasFeature) {
1212
$refs.dateDependencyModal.show()
1313
} else {
1414
$refs.paidFeaturesModal.show()
@@ -19,7 +19,7 @@
1919
>
2020
<i class="context__menu-item-icon baserow-icon-dependency"></i>
2121
{{ $t('dateDependencyModal.contextMenuItemLabel') }}
22-
<div v-if="deactivated" class="deactivated-label">
22+
<div v-if="!hasFeature" class="deactivated-label">
2323
<i class="iconoir-lock"></i>
2424
</div>
2525
</a>
@@ -70,7 +70,7 @@ export default {
7070
},
7171
},
7272
computed: {
73-
featureEnabled() {
73+
hasFeature() {
7474
return this.$hasFeature(
7575
EnterpriseFeatures.DATE_DEPENDENCY,
7676
this.database.workspace.id
@@ -87,6 +87,8 @@ export default {
8787
)
8888
},
8989
showEntry() {
90+
// Menu entry requested outside a field context (i.e. table sidebar menu,
91+
// view menu), so we can show it always.
9092
if (!this.field) {
9193
return true
9294
}

0 commit comments

Comments
 (0)