ish_manager 0.1.8.120 → 0.1.8.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 121e3b116deb996b432db939fdd1b947265eac74
-  data.tar.gz: c616ba4408a0e7a3ebd1467d7a89c47e9b537fd1
+  metadata.gz: 22a0ee908b1256f58c1acd9d32fd4ae7aae400e3
+  data.tar.gz: e1000487f081267dc261930269a2d61e8eac8e87
 SHA512:
-  metadata.gz: 0ecfc76da6025142de8e9949152b77d0806ecd71816ef33b9f6c8e4a0e45ec65cc28434f314266dd938e43d07228d0230c755283145341514ef20a04f9b1f90e
-  data.tar.gz: 493227a1a82eaf8e7c4bcdd8bc59cbe61b032bcbe4cdf590f1686c2d42a5b191d944e53e4ee0b99fc0bfb7f2c01b03bdf9591a9f70171fe535c45485e6bdff63
+  metadata.gz: cdb18476ab3e77ac283ecf6ba72b7981a6fdac7fd2bab1252a5c649a53e0164fa70c4c191059d94eb3640f4d70fd6e32429ddeee21d8286a45c1eb723b2c57b5
+  data.tar.gz: 4c0e3f8a65b5cf8ddba541302fffa32e23be10389a855bd97966e8130d81870fa61315748ee548742abecdb2f58c0a2ec79e3c2254c276633070675adbf8cb82

data/app/controllers/ish_manager/sites_controller.rb

@@ -29,7 +29,7 @@ class IshManager::SitesController < IshManager::ApplicationController
     @galleries = @site.galleries.unscoped.where({ :is_trash => false }).page( params[:galleries_page] ).per( 10 )
     @reports = @site.reports.unscoped.where({ :is_trash => false }).page( params[:reports_page] ).per( 10 )
     @videos = @site.videos.page( params[:videos_page] ).per( 5 )
-    @tags = @site.tags.page( params[:tags_page] ).per( 100 )
+    @tags = Tag.where( :site_id => @site.id ).page( params[:tags_page] ).per( 100 )
     @features = @site.features.page( params[:features_page] ).per( 9 )
     @newsitems = @site.newsitems.page( params[:newsitems_page] ).per( @site.newsitems_per_page )
   end

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

@@ -19,7 +19,7 @@
         = f.select :parent_tag_id, options_for_select( @tags_list, :selected => ( params[:for_tag] || @tag.parent_tag_id ) )
     .col-xs-12.col-md-6
       .input-field 
-        = f.select :site, options_for_select( @sites_list )
+        = f.select :site, options_for_select( @sites_list, :selected => @tag.site_id )
         = f.label "site"
     .col-xs-12.col-md-12
       .input-field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.120
+  version: 0.1.8.121
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails