Merge remote-tracking branch 'upstream/pull/5446'

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 625d43a5228f0b07a391f988a43cae3327364e67..bd5fd4dd62f359ecd0b163e555c87bd6420bd0f3 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -2,8 +2,10 @@ $(document).ready(function () {
   var marker, map;
 
   function setLocation(e) {
-    $("#latitude").val(e.latlng.lat);
-    $("#longitude").val(e.latlng.lng);
+    const latlng = e.latlng.wrap();
+
+    $("#latitude").val(latlng.lat);
+    $("#longitude").val(latlng.lng);
 
     if (marker) {
       map.removeLayer(marker);

diff --git a/app/controllers/api/messages_controller.rb b/app/controllers/api/messages_controller.rb
index cbbd8539cc76e7333437615341a8a2f9b45ba06f..ea5abe8dfc57a2afcab4638ae390dcd61163af15 100644 (file)
--- a/app/controllers/api/messages_controller.rb
+++ b/app/controllers/api/messages_controller.rb
@@ -5,7 +5,6 @@ module Api
     before_action :authorize
 
     before_action :check_api_writable, :only => [:create, :update, :destroy]
-    before_action :check_api_readable, :except => [:create, :update, :destroy]
 
     authorize_resource