ish_manager 0.1.8.259 → 0.1.8.260

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84b6d8ddc9f84cbccd94ef5f4568311e677cb5aec5b54a40a34718174ac461c
-  data.tar.gz: 62f8798a0498c1adce3416cc14d533d06d94939c74848877059a8a1fc6a658c5
+  metadata.gz: f6ee451db63e9c25624675fce5f5e85c80a60c9705f2b5b3cd5e3d6aaa88bb7a
+  data.tar.gz: 78df149f47519467e53b72c845b13897b035f799fe29f183aaf3291ca1a71577
 SHA512:
-  metadata.gz: '09cfbdc1c8603a09aa7a102188baa02ef84b0fceeb9ce9eef9b25564bc7a88f97307181a2b09a3dfaf2c5a4047f6a0951c52b4e2e9eafce74f87899feda87f6a'
-  data.tar.gz: 2af7d47b1690c2d759a809ff32bc7c4b66d6191ad72f226606413b02ea8058ec000715444714f573ef29436cf115b4b85bba3016699d5576af422b31913c4542
+  metadata.gz: bf7e81a7587039a8bb5be6960eee9ed7a7c23ec25c45f97c53fec1535afd9691c34788ccd40174ac7b88fbfee883dec169ff9f1f31621d9cda5ea6d773050df1
+  data.tar.gz: b768486aae09ef375d4a11f05198821eb4033577fb02770b429ac83238971941b26a6bdef720e77d647ebd54cb430af38d28051f756e8f722056921e4ee9873b

data/app/controllers/ish_manager/application_controller.rb

@@ -29,7 +29,7 @@ module IshManager
       @cities_list = City.list
       @galleries_list = Gallery.all.list
       @locations_list = ::Gameui::Map.list
-      @maps_list = ::Gameui::Map.list
+      @maps_list = ::Gameui::Map.list # @TODO: missing nonpublic!
       @reports_list = Report.all.list
       @sites_list = Site.all.list
       @tags_list = Tag.list

data/app/controllers/ish_manager/maps_controller.rb

@@ -47,7 +47,6 @@ class IshManager::MapsController < IshManager::ApplicationController
 
   def map_editor
     authorize! :update, @map
-    @markers = @map.markers.unscoped
   end
 
   def new
@@ -100,6 +99,7 @@ class IshManager::MapsController < IshManager::ApplicationController
   def set_map
     @map = ::Gameui::Map.unscoped.where(id: params[:id]).first
     @map ||= Gameui::Map.unscoped.find_by(slug: params[:id])
+    @markers = @map.markers.unscoped
   end
 
 end

data/app/controllers/ish_manager/markers_controller.rb

@@ -11,6 +11,8 @@ class IshManager::MarkersController < IshManager::ApplicationController
   end
 
   def edit
+    @marker = ::Gameui::Marker.unscoped.find params[:id]
+    @map = @marker.map
     authorize! :edit_marker, @map
   end
 
@@ -86,7 +88,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
   def marker_params
     out = params.require(:gameui_marker).permit!
 
-    out[:shared_profiles].delete('')
+    out[:shared_profiles].delete('') if out[:shared_profiles]
     if out[:shared_profiles].present?
       out[:shared_profiles] = Ish::UserProfile.find( out[:shared_profiles] )
     end

data/app/views/ish_manager/maps/show.haml

@@ -13,14 +13,14 @@
     [<>]
   .the-map
     = image_tag @map.image.image.url(:original) rescue nil
-    - @map.markers.each do |marker|
+    - @markers.each do |marker|
       -# @TODO: this should be a partial
       .marker{ style: "position: absolute; left: #{marker.x - marker.centerOffsetX}px; top: #{marker.y - marker.centerOffsetY}px;" }
         = image_tag marker.image.image.url(:original)
 
-  %p.addToggle Markers (#{@map.markers.count}) [<>]
+  %p.addToggle Markers (#{@markers.count}) [<>]
   .markers-list
-    - @map.markers.each do |marker|
+    - @markers.each do |marker|
       .flex-row.bordered
         = image_tag marker.image.image.url(:original)
         .flat-row

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.259
+  version: 0.1.8.260
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails