Skip to content

Commit fb8fbf0

Browse files
committed
enh: check that Circles is enabled for usergroup
Signed-off-by: Cleopatra Enjeck M. <[email protected]>
1 parent 75ad8e3 commit fb8fbf0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Share your tables and views with users and groups within your cloud.
2525
Have a good time and manage whatever you want.
2626
2727
]]></description>
28-
<version>0.9.0-dev.1</version>
28+
<version>0.9.0-dev.2</version>
2929
<licence>agpl</licence>
3030
<author mail="[email protected]">Florian Steffens</author>
3131
<namespace>Tables</namespace>

src/shared/components/ncTable/partials/columnTypePartials/forms/UsergroupForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ export default {
8383
// Used in searchUserGroup mixin to decide types to search for
8484
selectUsers: this.column.usergroupSelectUsers,
8585
selectGroups: this.column.usergroupSelectGroups,
86-
selectTeams: this.column.usergroupSelectTeams,
86+
selectTeams: this.isCirclesEnabled ? this.column.usergroupSelectTeams : false,
8787
selectOptions: {
8888
'usergroup-user': 'Users',
8989
'usergroup-group': 'Groups',
90-
'usergroup-team': 'Teams',
90+
...(this.isCirclesEnabled && { 'usergroup-team': 'Teams' }),
9191
},
9292
}
9393
},

src/shared/components/ncTable/partials/rowTypePartials/UsergroupForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default {
4343
return {
4444
selectUsers: this.column.usergroupSelectUsers,
4545
selectGroups: this.column.usergroupSelectGroups,
46-
selectTeams: this.column.usergroupSelectTeams,
46+
selectTeams: this.isCirclesEnabled ? this.column.usergroupSelectTeams : false,
4747
}
4848
},
4949
computed: {

0 commit comments

Comments
 (0)