ishapi 0.1.8.97 → 0.1.8.99

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c4d32628f38c30bc8408022256ba74ca8acef39569c69dae4f1b6185fd7bb08e
4
- data.tar.gz: ffa53e079bdbdd3feeb7c47a8e7e4cc3dc70677ae067cd99cc0c43e305cd3022
3
+ metadata.gz: 35601fdfce133a3aa267ac5b1a6a27e70367a51364c8f97602a6c6c18defb581
4
+ data.tar.gz: 6576d28952685290bda7be04499e721ea3a5822a3ec03587e358da61dd3d1df4
5
5
  SHA512:
6
- metadata.gz: 3cfbf091aea7c84860bcc689c4d073bd00bebf81e3677508b1b07f3dfaafccdbb4d8ea3b6c07b7f11c6179920d6fa882eb4c5f9b54c9b5bb9eb8c96761fd62c5
7
- data.tar.gz: b291e30702eb613cf991cf7608414822be456538908d5a6d55091d99abf4f9acb3b3100ee88faf05c9f2d18c8988de4d092db1a8c65f739087275286f87092c4
6
+ metadata.gz: 53cb6fcdc4df6ee593894eb579e5a75c59d384124355e367633480781ab2679dd9d4c643aa0a926bb8a221ee3b2c04226a9569bca3959cc0b9258f1ca87971d0
7
+ data.tar.gz: 0e09a517c7a3d40225a6fefa6b122e40ad8175d19cab125f235aa7f853cde43d7da1c0856fc52e43f9acd64513f086bedd62cb16624dfb2327bfa13a0b7d7392
@@ -32,15 +32,16 @@ json.newsitems do
32
32
  end
33
33
  end
34
34
 
35
- if item.video
36
- json.partial! 'ishapi/videos/show', :video => item.video
35
+ if item.video_id
36
+ json.partial! 'ishapi/videos/show', :video => Video.unscoped.find( item.video_id )
37
37
 
38
- json.item_type 'video'
39
- json.name item.video.name
40
- json.descr item.video.descr
41
- json.x item.video.x
42
- json.y item.video.y
43
- json.youtube_id item.video.youtube_id
38
+ # json.item_type 'video'
39
+ # json.name item.video.name
40
+ # json.descr item.video.descr
41
+ # json.x item.video.x
42
+ # json.y item.video.y
43
+ # json.youtube_id item.video.youtube_id
44
+ # json.url item.video.video.url
44
45
  end
45
46
  if item.photo
46
47
  json.item_type 'photo'
@@ -5,6 +5,8 @@ json.name video.name
5
5
  json.description video.descr
6
6
  json.x video.x
7
7
  json.y video.y
8
+ json.url video.video.url
9
+ json.item_type 'video'
8
10
 
9
11
  if video.city
10
12
  json.city_name video.city.name
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ishapi
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.97
4
+ version: 0.1.8.99
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-15 00:00:00.000000000 Z
11
+ date: 2019-04-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails