ish_manager 0.1.8.303 → 0.1.8.304

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd19370fd67c33b6e557e93fa9b22accf8b0435c819297b913feb9e776cd98af
-  data.tar.gz: 3fb8600347c68cea1d50b8ad624af0251d245e642546056e71eb389a240a6033
+  metadata.gz: 259eb867e91b4a93f763237341e16467eb4c7f785609b9fdec6649838b540676
+  data.tar.gz: '02556480cad5c8716e36a81439b13811c7e34b4e4e78865fb52e10236e94a6ab'
 SHA512:
-  metadata.gz: 72cc337cade1c7ff661d095368101c85117e95f103fe02502804fc6150eb48fd1b505359959345589a4fe57d0e2e53d13a50a14a869fc7373f84f6ef05f94ce4
-  data.tar.gz: ae7aa6abc0be702abc9c58424c9b938d9821a4a443442c8a458f404c6b77d84bcec36857003f59bf7ef5830414477df0080449c506a718b298102f2797e399d8
+  metadata.gz: 291e38d1ed8f6d5fe54a92736d41f8d59f30262dcc56da21b0618c7615f631ad566ef21b267a890db103f8ad070a3f41ca0464585d27da88f302dfeda07b1ca2
+  data.tar.gz: 46ed7b9a05b28152f1ccf5d126eea94bbfdcfc911eb7a2c329197b1e8b39691de04f6e2f567fededdf4cb1cf8e1fd639dd6e245904c0d54fd0a9880360e6c208

data/app/controllers/ish_manager/maps_controller.rb

@@ -22,12 +22,10 @@ class IshManager::MapsController < IshManager::ApplicationController
     end
     authorize! :create, @map
 
-    respond_to do |format|
-      if @map.save
-        format.html { redirect_to map_path(@map), notice: 'Map was successfully created.' }
-      else
-        format.html { render :new }
-      end
+    if @map.save
+      redirect_to map_path(@map), notice: 'Map was successfully created.'
+    else
+      render :new
     end
   end
 

data/app/controllers/ish_manager/markers_controller.rb

@@ -32,6 +32,10 @@ class IshManager::MarkersController < IshManager::ApplicationController
       @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
       @marker.title_image.save
     end
+    if params[:asset3d]
+      @marker.asset3d = ::Gameui::Asset3d.new object: params[:asset3d]
+      @marker.asset3d.save
+    end
 
     respond_to do |format|
       if @marker.save
@@ -55,6 +59,10 @@ class IshManager::MarkersController < IshManager::ApplicationController
       @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
       @marker.title_image.save
     end
+    if params[:asset3d]
+      @marker.asset3d = ::Gameui::Asset3d.new object: params[:asset3d]
+      @marker.asset3d.save
+    end
 
     old_map = @marker.map
     respond_to do |format|

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

@@ -2,7 +2,7 @@
 -# ish_manager / maps / _form
 -#
 
-- url = params[:action] == 'new' ? maps_path : map_path(@map.id)
+- url = %w| new create |.include?( params[:action] ) ? maps_path : map_path(@map.id)
 
 
 = form_for @map, :html => { :multipart => true, class: '--form maps--form' }, url: url do |f|

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

@@ -10,5 +10,5 @@
         = image_tag m.image ? m.image.image.url(:original) : image_missing
         = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{m.centerOffsetY-10}px; left: #{m.centerOffsetX-10}px;" )
 
-  = render 'ish_manager/markers/index_small', markers: @markers, map: @map
+  = render 'ish_manager/markers/index', markers: @markers, map: @map
 

data/app/views/ish_manager/markers/_form.haml

@@ -31,6 +31,9 @@
           .image-thumb
             = image_tag(@marker.image.image.url(:original)) rescue nil
             = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{@marker.centerOffsetY-10}px; left: #{@marker.centerOffsetX-10}px;" )
+        .field
+          = f.label :asset3d
+          = file_field_tag :asset3d
       .col.s3
         .field
           = f.label :centerOffsetX

data/app/views/ish_manager/markers/_index.haml

@@ -3,7 +3,7 @@
   - markers.each do |marker|
     .Card
       - if marker.title_image
-        = image_tag marker.title_image.image.url(:original)
+        = image_tag marker.title_image.image.url(:thumb)
       - else
         = image_missing_tag
       .flex-row

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.303
+  version: 0.1.8.304
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -368,7 +368,7 @@ files:
 - app/views/ish_manager/markers/_form.haml
 - app/views/ish_manager/markers/_header.haml
 - app/views/ish_manager/markers/_index.haml
-- app/views/ish_manager/markers/_index_small.haml
+- app/views/ish_manager/markers/_index_small.haml-trash
 - app/views/ish_manager/markers/edit.haml
 - app/views/ish_manager/markers/new.haml
 - app/views/ish_manager/newsitems/_form.haml