ishapi 0.1.8.55 → 0.1.8.56

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2400032cb65443964b6733c0b4bb021f5494e6aa
4
- data.tar.gz: 915255547b7358ce69fe7bba7ebdaf34e307de01
3
+ metadata.gz: 24d6579d6d97e36adf4fdf6b8315c1fda633667e
4
+ data.tar.gz: 2918518615aa9764fce332dfd3cde1af36c5bd7f
5
5
  SHA512:
6
- metadata.gz: 7b190485e68107a19a3834763e902c223588e578fc4dd7624c2856990035433aad15c0d62c7dd4bed3c707559d71cee967cd72f5cdc29693ae6be7ea8f6a71c8
7
- data.tar.gz: a1b7f50f6abf31bad3fd15b5e906e2ac7439ab25a71fc7d5fc5c1962ceb1df4ff42103e0e034e74d22c85684f240caef581babbf9e362ca70b8dac1cb60d0dfd
6
+ metadata.gz: b556d67b9b81eb8f844cc27b37e2b535a9d3c3a835a9d364a43c757ab43e4bcae408330b1352cdac872a6fa9ff1919dbfccc057236c77dc192872aac59a15658
7
+ data.tar.gz: e992dad210b761adc29ceff0ccb880477f5ee2d5c4b942e0429f6a2a98033884851d7585f36b4b2e8a455fa6412d1714ab812c7ed13e02dab65825618a667b61
@@ -9,6 +9,10 @@ module Ishapi
9
9
  city = City.find_by :cityname => params[:cityname]
10
10
  @galleries = @galleries.where( :city => city )
11
11
  end
12
+ if params[:domain]
13
+ @site = Site.find_by( :domain => params[:domain], :lang => 'en' )
14
+ @galleries = @galleries.where( :site => @site )
15
+ end
12
16
  @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
13
17
  end
14
18
 
@@ -6,9 +6,10 @@
6
6
  json.n_newsitems newsitems.count
7
7
  json.newsitems do
8
8
  json.array! newsitems do |item|
9
- json.created_at item.created_at
10
- json.descr item.descr
11
- json.name item.name
9
+ json.created_at item.created_at
10
+ json.descr item.descr
11
+ json.description item.descr
12
+ json.name item.name
12
13
 
13
14
  if item.gallery
14
15
  json.item_type 'gallery' #@TODO: should be a constant
@@ -7,6 +7,7 @@ json.n_reports reports.count
7
7
  json.reports do
8
8
  json.array! reports do |report|
9
9
  json.id report.id.to_s
10
+ json.created_at report.created_at
10
11
  json.name report.name
11
12
  json.reportname report.name_seo
12
13
  json.description report.descr
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.55
4
+ version: 0.1.8.56
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-28 00:00:00.000000000 Z
11
+ date: 2017-12-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails