ish_manager 0.1.8.303 → 0.1.8.304

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/ish_manager/maps_controller.rb +4 -6
  3. data/app/controllers/ish_manager/markers_controller.rb +8 -0
  4. data/app/views/ish_manager/maps/_form.haml +1 -1
  5. data/app/views/ish_manager/maps/map_editor.haml +1 -1
  6. data/app/views/ish_manager/markers/_form.haml +3 -0
  7. data/app/views/ish_manager/markers/_index.haml +1 -1
  8. data/app/views/ish_manager/markers/{_index_small.haml → _index_small.haml-trash} +0 -0
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bd19370fd67c33b6e557e93fa9b22accf8b0435c819297b913feb9e776cd98af
4
- data.tar.gz: 3fb8600347c68cea1d50b8ad624af0251d245e642546056e71eb389a240a6033
3
+ metadata.gz: 259eb867e91b4a93f763237341e16467eb4c7f785609b9fdec6649838b540676
4
+ data.tar.gz: '02556480cad5c8716e36a81439b13811c7e34b4e4e78865fb52e10236e94a6ab'
5
5
  SHA512:
6
- metadata.gz: 72cc337cade1c7ff661d095368101c85117e95f103fe02502804fc6150eb48fd1b505359959345589a4fe57d0e2e53d13a50a14a869fc7373f84f6ef05f94ce4
7
- data.tar.gz: ae7aa6abc0be702abc9c58424c9b938d9821a4a443442c8a458f404c6b77d84bcec36857003f59bf7ef5830414477df0080449c506a718b298102f2797e399d8
6
+ metadata.gz: 291e38d1ed8f6d5fe54a92736d41f8d59f30262dcc56da21b0618c7615f631ad566ef21b267a890db103f8ad070a3f41ca0464585d27da88f302dfeda07b1ca2
7
+ data.tar.gz: 46ed7b9a05b28152f1ccf5d126eea94bbfdcfc911eb7a2c329197b1e8b39691de04f6e2f567fededdf4cb1cf8e1fd639dd6e245904c0d54fd0a9880360e6c208
data/app/controllers/ish_manager/maps_controller.rb CHANGED
@@ -22,12 +22,10 @@ class IshManager::MapsController < IshManager::ApplicationController
22
22
  end
23
23
  authorize! :create, @map
24
24
 
25
- respond_to do |format|
26
- if @map.save
27
- format.html { redirect_to map_path(@map), notice: 'Map was successfully created.' }
28
- else
29
- format.html { render :new }
30
- end
25
+ if @map.save
26
+ redirect_to map_path(@map), notice: 'Map was successfully created.'
27
+ else
28
+ render :new
31
29
  end
32
30
  end
33
31
 
data/app/controllers/ish_manager/markers_controller.rb CHANGED
@@ -32,6 +32,10 @@ class IshManager::MarkersController < IshManager::ApplicationController
32
32
  @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
33
33
  @marker.title_image.save
34
34
  end
35
+ if params[:asset3d]
36
+ @marker.asset3d = ::Gameui::Asset3d.new object: params[:asset3d]
37
+ @marker.asset3d.save
38
+ end
35
39
 
36
40
  respond_to do |format|
37
41
  if @marker.save
@@ -55,6 +59,10 @@ class IshManager::MarkersController < IshManager::ApplicationController
55
59
  @marker.title_image = ::Ish::ImageAsset.new :image => params[:title_image]
56
60
  @marker.title_image.save
57
61
  end
62
+ if params[:asset3d]
63
+ @marker.asset3d = ::Gameui::Asset3d.new object: params[:asset3d]
64
+ @marker.asset3d.save
65
+ end
58
66
 
59
67
  old_map = @marker.map
60
68
  respond_to do |format|
data/app/views/ish_manager/maps/_form.haml CHANGED
@@ -2,7 +2,7 @@
2
2
  -# ish_manager / maps / _form
3
3
  -#
4
4
 
5
- - url = params[:action] == 'new' ? maps_path : map_path(@map.id)
5
+ - url = %w| new create |.include?( params[:action] ) ? maps_path : map_path(@map.id)
6
6
 
7
7
 
8
8
  = form_for @map, :html => { :multipart => true, class: '--form maps--form' }, url: url do |f|
data/app/views/ish_manager/maps/map_editor.haml CHANGED
@@ -10,5 +10,5 @@
10
10
  = image_tag m.image ? m.image.image.url(:original) : image_missing
11
11
  = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{m.centerOffsetY-10}px; left: #{m.centerOffsetX-10}px;" )
12
12
 
13
- = render 'ish_manager/markers/index_small', markers: @markers, map: @map
13
+ = render 'ish_manager/markers/index', markers: @markers, map: @map
14
14
 
data/app/views/ish_manager/markers/_form.haml CHANGED
@@ -31,6 +31,9 @@
31
31
  .image-thumb
32
32
  = image_tag(@marker.image.image.url(:original)) rescue nil
33
33
  = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{@marker.centerOffsetY-10}px; left: #{@marker.centerOffsetX-10}px;" )
34
+ .field
35
+ = f.label :asset3d
36
+ = file_field_tag :asset3d
34
37
  .col.s3
35
38
  .field
36
39
  = f.label :centerOffsetX
data/app/views/ish_manager/markers/_index.haml CHANGED
@@ -3,7 +3,7 @@
3
3
  - markers.each do |marker|
4
4
  .Card
5
5
  - if marker.title_image
6
- = image_tag marker.title_image.image.url(:original)
6
+ = image_tag marker.title_image.image.url(:thumb)
7
7
  - else
8
8
  = image_missing_tag
9
9
  .flex-row
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.303
4
+ version: 0.1.8.304
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-11 00:00:00.000000000 Z
11
+ date: 2022-08-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk
@@ -368,7 +368,7 @@ files:
368
368
  - app/views/ish_manager/markers/_form.haml
369
369
  - app/views/ish_manager/markers/_header.haml
370
370
  - app/views/ish_manager/markers/_index.haml
371
- - app/views/ish_manager/markers/_index_small.haml
371
+ - app/views/ish_manager/markers/_index_small.haml-trash
372
372
  - app/views/ish_manager/markers/edit.haml
373
373
  - app/views/ish_manager/markers/new.haml
374
374
  - app/views/ish_manager/newsitems/_form.haml