ish_manager 0.1.8.153 → 0.1.8.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3f73e8e1ffc6547e2e6315396ce1ad83f184c1
-  data.tar.gz: 187c05ee4ea4088f4a5587f2e3164a1b41d31438
+  metadata.gz: db746bb8c09c4491024c1ced104c9c5d7c30d085
+  data.tar.gz: 4439a3905c3e508ab0c92bc4f26ab21c0bec1cbd
 SHA512:
-  metadata.gz: ca1d64c0653eb9bfab8456e6ca2f86a19e44cbd95d2ce0e320c2dcc179c2ec7556718e481892d9d58e001269e40ca46e7646c6d7b0edd23225afc1f775e460aa
-  data.tar.gz: 108c7c2b9aa389ce5229b381bbba11ec1cee9ec0574e23fe81dea51ae6813b60ca145ef8abcc2759705f72e8c10baffa0eb79007389e1739f2dad6409dfbf9bb
+  metadata.gz: affaed61741c700f4fa0220ffb484386d4b9d6482d16503239b03146f7557a9c72ae12af7c8822fa6eedb3deb4cbac0ed0281683f223e44112756661864e6219
+  data.tar.gz: 892c86116a3540ad33858797ba406cdc44ba6f20f785c4eba70d3b042545b4a448e6db4169cb6e2cce094fc631f13c4d554da1cdc4b075ad6d35e0b726880dea

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -86,12 +86,18 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   end
 
   def update
-    if params[:site_id]
-      @site = Site.find params[:site_id]
+    if params[:site_id] || params[:newsitem][:site_id]
+      if params[:site_id]
+        @site = Site.find params[:site_id]
+      end
+      if params[:newsitem][:site_id]
+        @site = Site.find params[:newsitem][:site_id]
+      end
       @site.touch
       @newsitem = @site.newsitems.find params[:id]
       url = edit_site_path( @site )
     end
+
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem = @city.newsitems.find params[:id]
@@ -124,6 +130,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem = @city.newsitems.find( params[:id] )
     end
     authorize! :edit, @newsitem
+    
   end
 
   def index
@@ -139,6 +146,9 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @videos_list    = Video.list
     @galleries_list = Gallery.list
     @reports_list   = Report.list
+    @sites_list = Site.list
+    @cities_list = City.list
+    @tags_list = Tag.list
   end
 
 end

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

@@ -2,13 +2,13 @@
 = form_for newsitem, :html => { :multipart => true } do |f|
   .a
     = f.label :site
-    = f.select :site_id, options_for_select( @sites, :selected => ( @site ? @site.id : nil ) )
+    = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : nil ) )
     %br
     = f.label :city
-    = f.select :city_id, options_for_select( @cities, :selected => ( @city ? @city.id : nil ) )
+    = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : nil ) )
     %br
     = f.label :tag
-    = f.select :tag_id, options_for_select( @tags, (@tag||Tag.new).id )
+    = f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
 
   .a
     = f.label :name
@@ -18,13 +18,13 @@
     = f.text_area :descr, :class => :tinymce
   .a
     = f.label :video
-    = f.select :video_id, options_for_select( @videos_list )
+    = f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id )
   .a
     = f.label :gallery
-    = f.select :gallery_id, options_for_select( @galleries_list )
+    = f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id )
   .a
     = f.label :report
-    = f.select :report_id, options_for_select( @reports_list )
+    = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
   .a
     = label_tag :photo
     = file_field_tag :photo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.153
+  version: 0.1.8.154
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-21 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails