diff --git a/src/main/java/org/olat/group/model/ContactViewExtended.java b/src/main/java/org/olat/group/model/ContactViewExtended.java index da390bb9d5011b7bf93c0ee12739390830e83cff..8c49b78b0c5abd5d648fdd86238851f12e0cc94f 100644 --- a/src/main/java/org/olat/group/model/ContactViewExtended.java +++ b/src/main/java/org/olat/group/model/ContactViewExtended.java @@ -66,7 +66,7 @@ public class ContactViewExtended implements BusinessGroupMemberView, IdentityNam @Column(name="bg_id", nullable=false, insertable=false, updatable=false) private Long groupKey; - @Column(name="bg_id", nullable=false, insertable=false, updatable=false) + @Column(name="bg_name", nullable=false, insertable=false, updatable=false) private String groupName; @Override diff --git a/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql b/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql index a9ba9b1840d6ddf38c2f2b7c1208a018bef0d42b..215b4348b6ce825ce06635727217ac24fb648a29 100644 --- a/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql +++ b/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql @@ -212,7 +212,7 @@ create view o_gp_contactext_v as ( last_member.propvalue as member_lastname, bg_me.fk_identity_id as me_id, bgroup.group_id as bg_id, - bgroup.group_id as bg_name + bgroup.groupname as bg_name from o_gp_business as bgroup inner join o_bs_group_member as bg_member on (bg_member.fk_group_id = bgroup.fk_group_id) inner join o_bs_identity as id_member on (bg_member.fk_identity_id = id_member.id) diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql index def00f1d8404ba0118bc3644b92ca8ead0811e6d..644624675f2270599f889d7e74efb4c2507fa7f2 100644 --- a/src/main/resources/database/mysql/setupDatabase.sql +++ b/src/main/resources/database/mysql/setupDatabase.sql @@ -1492,7 +1492,7 @@ create view o_gp_contactext_v as ( last_member.propvalue as member_lastname, bg_me.fk_identity_id as me_id, bgroup.group_id as bg_id, - bgroup.group_id as bg_name + bgroup.groupname as bg_name from o_gp_business as bgroup inner join o_bs_group_member as bg_member on (bg_member.fk_group_id = bgroup.fk_group_id) inner join o_bs_identity as id_member on (bg_member.fk_identity_id = id_member.id) diff --git a/src/main/resources/database/oracle/alter_9_4_0_to_10_0_0.sql b/src/main/resources/database/oracle/alter_9_4_0_to_10_0_0.sql index d5ac592fe174fc0fa31f04a991ce36444f40780d..4b253fda77073bd38a1589f66f5dc25646ee3bd5 100644 --- a/src/main/resources/database/oracle/alter_9_4_0_to_10_0_0.sql +++ b/src/main/resources/database/oracle/alter_9_4_0_to_10_0_0.sql @@ -214,7 +214,7 @@ create view o_gp_contactext_v as ( last_member.propvalue as member_lastname, bg_me.fk_identity_id as me_id, bgroup.group_id as bg_id, - bgroup.group_id as bg_name + bgroup.groupname as bg_name from o_gp_business bgroup inner join o_bs_group_member bg_member on (bg_member.fk_group_id = bgroup.fk_group_id) inner join o_bs_identity id_member on (bg_member.fk_identity_id = id_member.id) diff --git a/src/main/resources/database/oracle/setupDatabase.sql b/src/main/resources/database/oracle/setupDatabase.sql index e48a52819eddb331a20cb63f7d8dca7f96f10d97..081b7fdcd47926938e988e7cc549dc187efc948b 100644 --- a/src/main/resources/database/oracle/setupDatabase.sql +++ b/src/main/resources/database/oracle/setupDatabase.sql @@ -1544,7 +1544,7 @@ create view o_gp_contactext_v as ( last_member.propvalue as member_lastname, bg_me.fk_identity_id as me_id, bgroup.group_id as bg_id, - bgroup.group_id as bg_name + bgroup.groupname as bg_name from o_gp_business bgroup inner join o_bs_group_member bg_member on (bg_member.fk_group_id = bgroup.fk_group_id) inner join o_bs_identity id_member on (bg_member.fk_identity_id = id_member.id) diff --git a/src/main/resources/database/postgresql/alter_9_4_0_to_10_0_0.sql b/src/main/resources/database/postgresql/alter_9_4_0_to_10_0_0.sql index af530f416d5de55a49d9ab573f9efeb9238ee0d5..5b65a1af15678182ecc08b66af028820589075a7 100644 --- a/src/main/resources/database/postgresql/alter_9_4_0_to_10_0_0.sql +++ b/src/main/resources/database/postgresql/alter_9_4_0_to_10_0_0.sql @@ -216,7 +216,7 @@ create view o_gp_contactext_v as ( last_member.propvalue as member_lastname, bg_me.fk_identity_id as me_id, bgroup.group_id as bg_id, - bgroup.group_id as bg_name + bgroup.groupname as bg_name from o_gp_business as bgroup inner join o_bs_group_member as bg_member on (bg_member.fk_group_id = bgroup.fk_group_id) inner join o_bs_identity as id_member on (bg_member.fk_identity_id = id_member.id) diff --git a/src/main/resources/database/postgresql/setupDatabase.sql b/src/main/resources/database/postgresql/setupDatabase.sql index 2eb8b19b999afdbc9ac594d7c69c3ea57e3ca393..1aa361426490ecf7a84a9cc40a2d48b9425a0c97 100644 --- a/src/main/resources/database/postgresql/setupDatabase.sql +++ b/src/main/resources/database/postgresql/setupDatabase.sql @@ -1493,7 +1493,7 @@ create view o_gp_contactext_v as ( last_member.propvalue as member_lastname, bg_me.fk_identity_id as me_id, bgroup.group_id as bg_id, - bgroup.group_id as bg_name + bgroup.groupname as bg_name from o_gp_business as bgroup inner join o_bs_group_member as bg_member on (bg_member.fk_group_id = bgroup.fk_group_id) inner join o_bs_identity as id_member on (bg_member.fk_identity_id = id_member.id)