ish_manager 0.1.8.123 → 0.1.8.124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c6a0b6aa5fed07b31412424c50e2f14c395930
-  data.tar.gz: 63cce52eb81e45612c83ae89a3088c229f47805b
+  metadata.gz: f7cca36c631eccee721ad01581f4b71025273b60
+  data.tar.gz: f515eb9235563b9b83e668434b540912ee0c4e0f
 SHA512:
-  metadata.gz: bc8df32d95c61e57a56c3d297f65b5147dd74854a2e27a59b4d6ea90a373c0ba9d44764b17606def53253a752db793dfb11b791054ee14fea4e99b02536f33ed
-  data.tar.gz: 6195b25ea59759e07c2537e81eb392ce6ff8771b20d37395ad79f755e4e593c2e0db47f37f8c86ba27f8ca3c6068ab29e3ef1914ef948497eb789c9d7ae598ec
+  metadata.gz: e4e60bbe8b856e35a3651d715b34e2b22e68ce989cf6ef4ab773c3aeb04128a86bea2d3d850a44fa8516f3dbd234c357a784bfd0a6118fd9e88b0a825b4bbc51
+  data.tar.gz: 610da5990c1c1e2a15918e4b65522c29d01ce0c1bd2eb493c527d3609a7998d3517d3d569b65452cf61b95c30195400a346f817f9d7a377df657e3ace8c66ab5

data/app/controllers/ish_manager/features_controller.rb

@@ -112,14 +112,16 @@ class IshManager::FeaturesController < IshManager::ApplicationController
     end    
   end
 
-=begin
   def index
     if params[:tag_id]
       @resource = Tag.find params[:tag_id]
     end
-    
+    if params[:site_id]
+      @resource = Site.find params[:site_id]
+    end
+    authorize! :features_index, @resource
+    @features = @resource.features
   end
-=end
 
   def destroy
     if params[:tag_id]

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -110,6 +110,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     authorize! :edit, @newsitem
   end
 
+  def index
+    @resource = Site.find( params[:site_id] ) if params[:site_id]
+    @resource = City.find( params[:site_id] ) if params[:city_id]
+    authorize! :newsitems_index, @resource
+    @newsitems = @resource.newsitems
+  end
+
   private
 
   def set_lists

data/app/controllers/ish_manager/sites_controller.rb

@@ -26,11 +26,11 @@ class IshManager::SitesController < IshManager::ApplicationController
   def show
     @site = Site.unscoped.find params[:id]
     authorize! :show, @site
-    @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 )
+    @galleries = @site.galleries.page( params[:galleries_page] ).per( 10 )
+    @reports = @site.reports.page( params[:reports_page] ).per( 10 )
     @videos = @site.videos.page( params[:videos_page] ).per( 5 )
     @tags = Tag.where( :site_id => @site.id, :parent_tag_id => nil ).page( params[:tags_page] ).per( 100 )
-    @features = @site.features.page( params[:features_page] ).per( 9 )
+    @features = @site.features.limit( @site.n_features ) # page( params[:features_page] ).per( 9 )
     @newsitems = @site.newsitems.page( params[:newsitems_page] ).per( @site.newsitems_per_page )
   end
 
@@ -77,5 +77,23 @@ class IshManager::SitesController < IshManager::ApplicationController
     redirect_to site_path( @site.id )
   end
 
+  def reports
+    @site = Site.find params[:site_id]
+    authorize! :reports_index, @site
+    @reports = @site.reports.page( params[:reports_page] )
+    render 'ish_manager/reports/index'
+  end
+
+  def galleries
+    @site = Site.find params[:site_id]
+    authorize! :galleries_index, @site
+    @galleries = @site.galleries.page( params[:galleries_page] )
+  end
+
+  #
+  # private
+  #
+  private
+
 end
 

data/app/controllers/ish_manager/tags_controller.rb

@@ -6,6 +6,9 @@ class IshManager::TagsController < IshManager::ApplicationController
   def index
     @tags = Tag.unscoped.where( :parent_tag_id => nil ).order_by( :name => :asc )
     authorize! :index, Tag.new
+
+    @site = Site.find( params[:site_id] ) if params[:site_id] 
+    @city = City.find( params[:city_id] ) if params[:city_id] 
   end
   
   def show

data/app/controllers/ish_manager/videos_controller.rb

@@ -17,6 +17,13 @@ class IshManager::VideosController < IshManager::ApplicationController
       @videos = @videos.where( :tag => tag )
     end
     
+    if params[:site_id]
+      @site = Site.find params[:site_id]
+      @videos = @site.videos
+    end
+    
+    @videos = @videos.page( params[:videos_page] )
+
     respond_to do |format|
       format.html do
         render

data/app/views/ish_manager/features/index.haml

@@ -1,25 +1,25 @@
 
 .row
   .large-12.columns
-    %h5 Features in <b>#{@resource.class.name}</b> #{@resource.name}/
+    %h5 Features in <b>#{@resource.class.name}</b> #{@resource.name}
 
     %ul
       - @resource.features.each do |feature|
-        %li
-          .gray= feature.id
-          
-          = link_to '[~]', edit_manager_city_feature_path( @resource, feature ) if 'City' == @resource.class.name
-          = link_to '[~]', edit_manager_tag_feature_path( @resource, feature ) if 'Tag' == @resource.class.name
-          = link_to '[~]', edit_manager_site_feature_path( @resource, feature ) if 'Site' == @resource.class.name
-          = link_to '[~]', edit_manager_venue_feature_path( @resource, feature ) if 'Venue' == @resource.class.name
-          
-          = link_to( '[x]', manager_city_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'City' == @resource.class.name
-          = link_to( '[x]', manager_tag_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Tag' == @resource.class.name
-          = link_to( '[x]', manager_site_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Site' == @resource.class.name
-          = link_to( '[x]', manager_venue_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Venue' == @resource.class.name
-          
-          %ul
-            %li Name #{feature.name}
-            %li Subhead: #{feature.subhead}
-            %li Report: #{feature.report}
-            %li Gallery: #{feature.gallery}
+        %li.panel
+          .panel-body
+
+            = link_to '[~]', edit_city_feature_path( @resource, feature ) if 'City' == @resource.class.name
+            = link_to '[~]', edit_tag_feature_path( @resource, feature ) if 'Tag' == @resource.class.name
+            = link_to '[~]', edit_site_feature_path( @resource, feature ) if 'Site' == @resource.class.name
+            = link_to '[~]', edit_venue_feature_path( @resource, feature ) if 'Venue' == @resource.class.name
+
+            = link_to( '[x]', city_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'City' == @resource.class.name
+            = link_to( '[x]', tag_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Tag' == @resource.class.name
+            = link_to( '[x]', site_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Site' == @resource.class.name
+            = link_to( '[x]', venue_feature_path( @resource, feature ), :method => :delete, :data => { :confirm => :'Are you sure?' } ) if 'Venue' == @resource.class.name
+
+            %ul
+              %li Name #{feature.name}
+              %li Subhead: #{feature.subhead}
+              %li Report: #{feature.report}
+              %li Gallery: #{feature.gallery}

data/app/views/ish_manager/galleries/_list.haml

@@ -4,6 +4,9 @@
 
 - if galleries.length > 0
   .galleries--list
+    - if galleries.respond_to? :total_pages
+      = paginate galleries, :param_name => param_name, :views_prefix => 'ish_manager'
+
     - galleries.each do |g|
       .panel
         .panel-body
@@ -20,7 +23,7 @@
               = link_to image_tag(photo.photo.url(:thumb), :alt => g.name, :class => :thumb ), gallery_path(g.galleryname)
 
     - if galleries.respond_to? :total_pages
-      = paginate galleries, :param_name => param_name
+      = paginate galleries, :param_name => param_name, :views_prefix => 'ish_manager'
     
 - else
   %h5 No Galleries

data/app/views/ish_manager/galleries/index.haml

@@ -5,6 +5,8 @@
 - content_for :menu do
   - # nothing
 
+= render 'ish_manager/sites/header', :site => @site if @site
+
 .container
   .row
     .col-sm-6
@@ -16,7 +18,7 @@
     .col-sm-12
       -# = render 'ish_manager/galleries/menu_secondary'
       = render 'ish_manager/galleries/list', :galleries => @galleries, :param_name => :galleries_page
-
+      
 .container
   .row
     .col-sm-12

data/app/views/ish_manager/leads/index.haml

@@ -14,7 +14,6 @@
       %th Email
       %th Job Url
       %th Description
-      %th Done?
     - @leads.each do |lead|
       %tr
         %td= link_to raw('<i class="fa fa-play"></i>'), lead_path( lead )
@@ -23,4 +22,3 @@
         %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}"
         %td= link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank'
         %td= lead.description
-        %td= lead.is_done ? raw('<i class="fa fa-check"></i>') : nil

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

@@ -0,0 +1,9 @@
+
+
+- if @resource.class.name == 'Site'
+  = render 'ish_manager/sites/header', :site => @resource
+  = render 'index', :newsitems => @newsitems, :site => @resource
+  
+- if @resource.class.name == 'City'
+  = render 'ish_manager/cities/header', :city => @resource
+  = render 'index', :newsitems => @newsitems, :city => @resource

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

@@ -1,4 +1,5 @@
 
+- reports ||= @reports
 - reports = reports.page( params[:reports_page] ).per( 10 )
 - if defined? site
   - new_path = new_site_report_path( site.id )
@@ -12,7 +13,7 @@
         Reports (#{reports.length})
         = link_to image_new, new_path
 
-      = paginate reports, :param_name => :reports_page
+      = paginate reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
       %ol
         - reports.each do |report|
           %li
@@ -21,5 +22,5 @@
             = link_to report.name, report_path( report )
             - if report.subhead && report.subhead.length > 3
               .subhead= report.subhead
-      = paginate reports, :param_name => :reports_page
+      = paginate reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
 

data/app/views/ish_manager/reports/index.haml

@@ -1,10 +1,13 @@
 
+-# ish_manager / reports / index
+
+- if @site
+  = render 'ish_manager/sites/header', :site => @site
+  
 .row
   .large-12.columns
     %h3
-      Reports Index (#{@reports.length})
-      - if @site
-        In #{@site.domain}/#{@site.lang}
+      Reports (#{@reports.length})
       = link_to image_new, new_report_path
       
     = paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
@@ -25,5 +28,5 @@
               Site #{report.site.domain}/#{report.site.lang}
             %br
             = report.created_at
-    = paginate @reports, :param_name => :reports_page
+    = paginate @reports, :param_name => :reports_page, :views_prefix => 'ish_manager'
     

data/app/views/ish_manager/sites/_header.haml

@@ -0,0 +1,16 @@
+
+- site ||= @site
+
+.manager-sites--title
+  %h1
+    Site http://#{site.domain}/#{site.lang}
+    = link_to '[~]', edit_site_path( site.id )
+
+  %ul
+    %li= link_to "Features (#{site.features.length})", site_features_path( site.id )
+    %li= link_to "Newsitems (#{site.newsitems.length})", site_newsitems_path( site.id )
+    %li= link_to "Reports (#{site.reports.length})", site_reports_path( site.id )
+    %li= link_to "Galleries (#{site.galleries.length})", site_galleries_path( site.id )
+    %li= link_to "Videos (#{site.videos.length})", site_videos_path( site.id )
+    %li= link_to "Tags (#{site.tags.length})", site_tags_path( site.id )
+    

data/app/views/ish_manager/sites/galleries.haml

@@ -0,0 +1,19 @@
+
+-# ish_manager / sites / galleries
+  
+- content_for :title do
+  Manager Galleries Index
+
+- content_for :menu do
+  - # nothing
+
+= render 'ish_manager/sites/header', :site => @site if @site
+
+.container
+  .row
+    .col-sm-12
+      %h4
+        Galleries (#{@galleries.count})
+        = link_to image_new, new_gallery_path
+      = render 'ish_manager/galleries/list', :galleries => @galleries, :param_name => :galleries_page
+      

data/app/views/ish_manager/sites/show.haml

@@ -1,7 +1,7 @@
 
 .manager-sites-show
-  = render 'title', :site => @site    
-  = render 'ish_manager/features/index',  :features  => @features.limit(@site.n_features),   :site => @site
+  = render 'header', :site => @site    
+  -# = render 'ish_manager/features/index', :features  => @features, :site => @site
   = render 'ish_manager/newsitems/index', :newsitems => @newsitems.limit(@site.n_newsitems), :site => @site
       
   .row

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

@@ -2,6 +2,8 @@
 - content_for :title do
   = t('tags.list')
 
+= render 'ish_manager/sites/header', :site => @site if @site
+
 .row
   .small-12.columns
     .center

data/app/views/ish_manager/videos/index.haml

@@ -1,3 +1,4 @@
 
+= render 'ish_manager/sites/header', :site => @site if @site
 = render 'index', :videos => @videos
 

data/config/routes.rb

@@ -39,9 +39,16 @@ IshManager::Engine.routes.draw do
 
   resources :sites do
     resources :features
-    resources :galleries
     resources :newsitems
+
+    get 'reports', :to => 'sites#reports'
     resources :reports
+
+    get 'galleries', :to => 'sites#galleries'
+
+    resources :galleries
+    resources :videos
+    resources :tags
   end
   
   resources :stock_actions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.123
+  version: 0.1.8.124
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -272,6 +272,7 @@ files:
 - app/views/ish_manager/newsitems/_item.haml
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/edit.haml~
+- app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
 - app/views/ish_manager/photos/_meta.haml
 - app/views/ish_manager/photos/_multinew.haml
@@ -285,8 +286,9 @@ files:
 - app/views/ish_manager/reports/new.haml
 - app/views/ish_manager/reports/show.haml
 - app/views/ish_manager/sites/_form.haml
-- app/views/ish_manager/sites/_title.haml
+- app/views/ish_manager/sites/_header.haml
 - app/views/ish_manager/sites/edit.haml
+- app/views/ish_manager/sites/galleries.haml
 - app/views/ish_manager/sites/index.haml
 - app/views/ish_manager/sites/new.haml
 - app/views/ish_manager/sites/show.haml

data/app/views/ish_manager/sites/_title.haml

@@ -1,5 +0,0 @@
-
-.manager-sites--title
-  %h1
-    Site http://#{@site.domain}/#{@site.lang}
-    = link_to '[~]', edit_site_path( @site.id )