From 07363bde008ebfcada2214a7a74458d46468f499 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 25 Jul 2014 09:12:09 +0200
Subject: [PATCH] OO-1000: fix mapping and view for the chat roster where the
key of the groups were shown and not the name
---
src/main/java/org/olat/group/model/ContactViewExtended.java | 2 +-
src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql | 2 +-
src/main/resources/database/mysql/setupDatabase.sql | 2 +-
src/main/resources/database/oracle/alter_9_4_0_to_10_0_0.sql | 2 +-
src/main/resources/database/oracle/setupDatabase.sql | 2 +-
.../resources/database/postgresql/alter_9_4_0_to_10_0_0.sql | 2 +-
src/main/resources/database/postgresql/setupDatabase.sql | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/group/model/ContactViewExtended.java b/src/main/java/org/olat/group/model/ContactViewExtended.java
index da390bb9d50..8c49b78b0c5 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 a9ba9b1840d..215b4348b6c 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 def00f1d840..644624675f2 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 d5ac592fe17..4b253fda770 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 e48a52819ed..081b7fdcd47 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 af530f416d5..5b65a1af156 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 2eb8b19b999..1aa36142649 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)
--
GitLab