Merge branch 'develop_onuma' into 'develop'

協業に参加できない不具合を修正した。

See merge request !198

public_new/js/views/chats/chat-room-message.js

@@ -75,7 +75,7 @@ ChatRoom.sendMessage = function (e) {
  *  Load Messages
  *  Load Messages
  ***********************/
  ***********************/
 ChatRoom.loadMessages = function (joinRoomID, joinRoomName) {
 ChatRoom.loadMessages = function (joinRoomID, joinRoomName) {
-  let roomID = joinRoomID.replace(/['"]+/g, "");
+  let roomID = joinRoomID.toString().replace(/['"]+/g, "");
   roomName = joinRoomName;
   roomName = joinRoomName;
   // 画面更新
   // 画面更新
   if (serverInfo.isOnline == true) {
   if (serverInfo.isOnline == true) {
@@ -253,6 +253,8 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
   const messageTime = CHAT_UTIL.formatDate(message.insertDate);
   const messageTime = CHAT_UTIL.formatDate(message.insertDate);
   const createdAtYear =
   const createdAtYear =
     message.insertDate.substring(0, 4) + getLocalizedString("year") + " ";
     message.insertDate.substring(0, 4) + getLocalizedString("year") + " ";
+  // 協業のタイプを数値から文字列に変換
+  const strCollaborationType = CHAT_UTIL.getCollaborationType(collaborationInfo.collaborationType);
 
 
   const html = Mustache.render(collaborationMessageTemplate, {
   const html = Mustache.render(collaborationMessageTemplate, {
     messageId: message.messageId,
     messageId: message.messageId,
@@ -261,7 +263,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
     userList: displayUserList,
     userList: displayUserList,
     insertDate: message.insertDate,
     insertDate: message.insertDate,
     // TODO: peacekim:: should check collaborationInfo.collaborationType is string or number
     // TODO: peacekim:: should check collaborationInfo.collaborationType is string or number
-    collaborationType: collaborationInfo.collaborationType,
+    collaborationType: strCollaborationType,
     meetingId: meetingID,
     meetingId: meetingID,
     isToday: isToday,
     isToday: isToday,
     createdAtDay: messageTime.createdAtDay,
     createdAtDay: messageTime.createdAtDay,

public_new/template/template_open_collaboration_message.html

@@ -34,7 +34,7 @@
         <div class="collabo_btn">
         <div class="collabo_btn">
           <button class="collaboation_join_button" type="button" name="button"
           <button class="collaboation_join_button" type="button" name="button"
             class="d-flex flex-row justify-content-center align-items-center"
             class="d-flex flex-row justify-content-center align-items-center"
-            onclick="NativeBridgeDelegate.joinCollaboration({{collaborationType}}, {{meetingId}})" {{#isEnded}} disabled
+            onclick="NativeBridgeDelegate.joinCollaboration('{{collaborationType}}', {{meetingId}})" {{#isEnded}} disabled
             {{/isEnded}}>
             {{/isEnded}}>
             <img src="icon/icon_profile_phone_white.svg" alt="通話">
             <img src="icon/icon_profile_phone_white.svg" alt="通話">
             {{#isEnded}}
             {{#isEnded}}