ish_manager 0.1.8.26 → 0.1.8.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac1cfe8747b5e52d40acd6815b66586707b5bf8
-  data.tar.gz: 221fe098e4184edabd40e66745af3b2ed9b8780d
+  metadata.gz: 54f465ac13fcfc2028cf6d3e46411ef9b73ccfbb
+  data.tar.gz: 2f1443216d52b63319250dc217cdaaed9ff76e66
 SHA512:
-  metadata.gz: a639eaaed192c7ac7864ecc3ec9a24f602aa26fbee7fffabaa3fb1a94d6ea37b1e5048f418f93b55dd63cf84c493cca9530385b9c1e8bcecfc741a29e3167881
-  data.tar.gz: ffef3f8d9c3631ae93b2a669cc81e912ead507cf34867066cea29190ae8621cbb5307e274267459d292cc1042db30f4b0faaef9076d51157c972a9a669850bd8
+  metadata.gz: 8726ef4ea29cba82e10c716d4d75d2bf32f62b899108ca998a82dd0f1c6aa2a3dbefa382087ad94c1c33d156daa34851e3eea0620c45298c7de1f039de71e5ea
+  data.tar.gz: c159b2cd8593e9dbf58d576d80d8bee1ca7baec3c3a020516ad63c05f7aa0311b569e55528f531c23584acb756846d93b099fb15db2e4469d39a81215185f80c

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -1,6 +1,8 @@
 
 class IshManager::NewsitemsController < IshManager::ApplicationController
 
+  before_action :set_lists
+
   def new
     @newsitem = Newsitem.new
     if params[:city_id]
@@ -11,14 +13,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @site = Site.find params[:site_id]
       @newsitem.site = @site
     end
+    authorize! :new, @newsitem
   end
 
   def create
     n = Newsitem.new params[:newsitem].permit!
-    n.report  = Report.find  params[:newsitem][:report_id]  unless params[:newsitem][:report_id].blank?
-    n.gallery = Gallery.find params[:newsitem][:gallery_id] unless params[:newsitem][:gallery_id].blank?
-    n.photo   = Photo.find   params[:newsitem][:photo_id]   unless params[:newsitem][:photo_id].blank?
-    n.descr   = params[:newsitem][:descr]
+    authorize! :create, n
 
     if params[:city_id]
       @city = City.find params[:city_id]
@@ -51,12 +51,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     end
   end
   
-  def show
-  end
-
-  def index
-  end
-
   def destroy
     authorize! :destroy, Newsitem
     if params[:city_id]
@@ -85,6 +79,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem = @city.newsitems.find params[:id]
       url = edit_city_path( @city )
     end
+    authorize! :update, @newsitem
     flag = @newsitem.update_attributes params[:newsitem].permit!
     
     if flag
@@ -105,6 +100,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @city = City.find params[:city_id]
       @newsitem = @city.newsitems.find( params[:id] )
     end
+    authorize! :edit, @newsitem
+  end
+
+  private
+
+  def set_lists
+    @videos_list = Video.list
   end
 
 end

data/app/controllers/ish_manager/videos_controller.rb

@@ -5,7 +5,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   
   def index
     authorize! :index, Video.new
-    @videos = Video.all # .where( :site_id => @site.id )
+    @videos = Video.unscoped.all
 
     if params[:city_id]
       city = City.find params[:city_id]
@@ -55,8 +55,10 @@ class IshManager::VideosController < IshManager::ApplicationController
     @video.user = current_user
     if params[:video][:site_id]
       @video.site = Site.find params[:video][:site_id]
+      @video.site.touch
     else
       @video.site = @site
+      @site.touch
     end
     authorize! :create, @video
     
@@ -85,6 +87,7 @@ class IshManager::VideosController < IshManager::ApplicationController
 
     @video.update params[:video].permit!
     if @video.save
+      @video.site.touch if @video.site
       flash[:notice] = 'Success.'
       redirect_to videos_path
     else

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

@@ -1,10 +1,16 @@
 
-= form_for [ :manager, newsitem ], :url => url do |f|
-  = f.label :name
-  = f.text_field :name
-
-  = f.label :descr
-  = f.text_area :descr, :class => :tinymce
-
-  = f.submit :submit
+= form_for newsitem do |f|
+  = hidden_field_tag :site_id, @site.id if @site
+  = hidden_field_tag :city_id, @city.id if @city
+  .a
+    = f.label :name
+    = f.text_field :name
+  .a
+    = f.label :descr
+    = f.text_area :descr, :class => :tinymce
+  .a
+    = f.label :video
+    = f.select :video_id, options_for_select( @videos_list )
+  .a
+    = f.submit :submit
   

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

@@ -11,7 +11,7 @@
 .manager-newsitems--index
   .row
     .col-sm-12
-      %h2 Newsitems (#{newsitems.count})
+      %h2 Newsitems (#{newsitems.count}) #{link_to '[+]', new_site_newsitem_path( site.id )}
       = paginate newsitems, :param_name => 'newsitems_page'
       %ol
         - newsitems.each do |n|

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

@@ -1,14 +1,16 @@
 
 - if defined? @city
-  - url = manager_city_newsitem_path( @city, @newsitem ) if @city
+  - url = city_newsitem_path( @city, @newsitem ) if @city
 - if defined? @site
-  - url = manager_site_newsitem_path( @site, @newsitem ) if @site
+  - url = site_newsitem_path( @site, @newsitem ) if @site
 
 .row
   .small-12.columns
     %h1 Edit this newsitem
-    For site: #{@sity} <br />
-    city: #{@city} <br />
+    - if @site
+      For site: #{@site.domain} #{@site.lang} <br />
+    - if @city
+      For city: #{@city.name} <br />
     id: #{@newsitem.id}
     
     = render 'form', :newsitem => @newsitem, :url => url

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

@@ -1,9 +1,4 @@
 
-- if @city
-  - url = manager_city_newsitems_path( :city_id => @city.id )
-- if @site
-  - url = manager_site_newsitems_path( :site_id => @site.id )
-  
 .row
   .small-12.columns
     %h1
@@ -12,5 +7,5 @@
       For Site #{@site.domain}
     - if @city
       For City #{@city.name}
-    = render 'form', :newsitem => @newsitem, :url => url
-  
+    = render 'form', :newsitem => @newsitem
+    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.26
+  version: 0.1.8.27
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails