ish_manager 0.1.8.52 → 0.1.8.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1907662cc8ccba86f8c812bfb9a9eab37e28b146
-  data.tar.gz: 52fd47592782b8e89dcdcc4a6a5ca2b75941df64
+  metadata.gz: 9c5635ac768418267102d40a8a8310ce6054757e
+  data.tar.gz: 63075c95fcf7f377f67012d6f7ffbea3ffeee558
 SHA512:
-  metadata.gz: cd138999ad7b3b8b457c307107a2e00fc49ead9a71113a3ed613fce89121961ae4cd582800c0081a6357de9eb3a839ceddb162062a4a83ca0eb4dee22834bd16
-  data.tar.gz: 43c34a8c2bba0b770b28df57174b0dd5117e629ba831fe599a61d193b7de1a2fdf5a1e858b63e0072f9b8464399716a7b204651c972e5f18132b59c67eba5f53
+  metadata.gz: 93b66baf48810fcce33b040d65733bdaffaa45e9ea0087a3f05d08db3776b4c54fdd73a8875c0b3487cd7786255d7486c3a1925c4cd2f8b92d3070481984d6c6
+  data.tar.gz: 4ce63769241cae185482b5c02de045db03069a4a7fcd0c9cb10f6225691983d48ce0a99771b8fa4003efa4bef77914df4dccbf26ffc9f8fd8716b1bbb392f68c

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -5,6 +5,8 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   def new
     @newsitem = Newsitem.new
+    @sites = Site.list
+    @cities = City.list
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem.city = @city
@@ -17,22 +19,25 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   end
 
   def create
-    n = Newsitem.new params[:newsitem].permit!
+    @newsitem = Newsitem.new params[:newsitem].permit!
     @resource = City.find params[:city_id] if params[:city_id]
+    @resource = City.find params[:newsitem][:city_id] if !params[:newsitem][:city_id].blank?
     @resource = Site.find params[:site_id] if params[:site_id]
+    @resource = Site.find params[:newsitem][:site_id] if !params[:newsitem][:site_id].blank?
+    @resource.newsitems << @newsitem
+
     authorize! :create_newsitem, @resource
 
     if params[:photo]
-      photo = Photo.new :photo => params[:photo]
-      n.photo = photo
+      photo = Photo.create :photo => params[:photo], :user_profile => current_user.profile
+      @newsitem.photo = photo
     end
 
-    @resource.newsitems << n
-    flag = @resource.save
+    flag = @newsitem.save && @resource.save
     if flag
       @resource.touch
     else
-      error = 'No Luck. ' + @resource.errors.inspect
+      error = 'No Luck. ' + @newsitem.errors.messages.to_s 
     end
     url = params[:city_id] ? edit_city_path( @resource.id ) : edit_site_path( @resource.id )
     
@@ -41,6 +46,9 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       redirect_to url
     else
       flash[:alert] = error
+      @sites = Site.list
+      @cities = City.list
+
       render :action => :new
     end
   end
@@ -75,6 +83,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     end
     if params[:photo]
       photo = Photo.new :photo => params[:photo]
+      photo.user_profile = current_user.profile
       @newsitem.photo = photo
     end
     authorize! :update, @newsitem

data/app/controllers/ish_manager/sites_controller.rb

@@ -2,7 +2,19 @@ class IshManager::SitesController < IshManager::ApplicationController
   
   def index
     authorize! :sites_index, ::Manager
-    @sites = Site.where( :is_trash => false ).order_by( :domainname => :desc, :lang => :desc )
+    sites = Site.where( :is_trash => false ).order_by( :domainname => :desc, :lang => :desc )
+    @site_groups = []
+    site_group = nil
+    previous_domain = nil
+    sites.each do |site|
+      if previous_domain == site.domain
+        site_group.push site
+      else
+        previous_domain = site.domain
+        @site_groups.push( site_group ) if !site_group.blank?
+        site_group = [ site ]
+      end
+    end
   end
 
   # not trash

data/app/helpers/ish_manager/application_helper.rb

@@ -9,5 +9,15 @@ module IshManager
       return errors
     end
 
+    def user_path user
+      if user.class == 'String'
+        "/users/#{user}"
+      elsif user.class == User
+        "/users/#{user.id}"
+      elsif user.class == NilClass
+        "/users"
+      end
+    end
+
   end
 end

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

@@ -6,7 +6,7 @@
     .col-sm-12
       %h2 Galleries (#{galleries.length})
 
-      = paginate galleries, :param_name => :galleries_page
+      = paginate galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
       %ol
         - galleries.each do |gallery|
           %li
@@ -14,5 +14,5 @@
               .mini= image_tag photo.photo.url( :thumb ), :alt => ''
             .clearfix
             #{link_to gallery.name, gallery_path( gallery )} (#{gallery.photos.unscoped.where({ :is_trash => false }).length})
-      = paginate galleries, :param_name => :galleries_page
+      = paginate galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
   %hr

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

@@ -1,7 +1,16 @@
 
 = form_for newsitem, :html => { :multipart => true } do |f|
-  = hidden_field_tag :site_id, @site.id if @site
-  = hidden_field_tag :city_id, @city.id if @city
+  - if @site
+    = hidden_field_tag :site_id, @site.id
+  - elsif @city
+    = hidden_field_tag :city_id, @city.id
+  - else
+    = f.label :site
+    = f.select :site_id, options_for_select( @sites )
+    %br
+    = f.label :city
+    = f.select :city_id, options_for_select( @cities )
+  
   .a
     = f.label :name
     = f.text_field :name

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

@@ -14,7 +14,7 @@
   .row
     .col-sm-12
       %h2 Newsitems (#{newsitems.count}) #{link_to '[+]', new_newsitem }
-      = paginate newsitems, :param_name => 'newsitems_page'
+      = paginate newsitems, :param_name => 'newsitems_page', :views_prefix => 'ish_manager'
       - newsitems.each do |n|
         .panel
           .panel-body
@@ -26,5 +26,7 @@
                 Desc: #{n.descr}
               %li Report id: #{n.report_id}
               %li Gallery id: #{n.gallery_id}
+              - if n.photo
+                %li Photo id: #{n.photo.id}
             = render 'ish_manager/newsitems/item', :newsitem => n
   %hr

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

@@ -6,5 +6,5 @@
     %br
       
 = render 'form', :site => @site
-= render 'ish_manager/features/index',  :features  => @site.features.limit(16),  :site => @site
-= render 'ish_manager/newsitems/index', :newsitems => @site.newsitems.limit(10), :site => @site
+= render 'ish_manager/features/index',  :features  => @site.features.limit(@site.n_features),   :site => @site
+= render 'ish_manager/newsitems/index', :newsitems => @site.newsitems.limit(@site.n_newsitems), :site => @site

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

@@ -1,28 +1,17 @@
 
+- per_row = 2
 .sites-index
   %h3 Sites
   .row
-    - @sites.each_with_index do |site, index|
-      .col-xs-12.col-lg-4
+    - @site_groups.each_with_index do |sites, index|
+      .col-xs-12{ :class => "col-sm-#{12/per_row}" }
         .panel.panel-primary
           .panel-body
-            %h5
-              = link_to "#{site.domain}/#{site.lang}", site_path( site )
-              = link_to '[~]', edit_site_path( site )
-            .title Title: #{site.title}
-            .language Language: #{site.lang}
-            .subhead Subhead: #{site.subhead}
-            %ul
-              %li
-                #{site.galleries.length} galleries
-              %li
-                #{site.newsitems.length} newsitems
-              %li
-                = link_to "#{site.n_reports} reports (#{site.n_private_reports} private)", site_reports_path( site.id )
-              %li
-                #{site.tags.length} tags
-              %li
-                #{site.videos.length} videos
-      - if (index + 1 ) % 3 == 0
+            - sites.each do |site|
+              %h5
+                = link_to "#{site.domain}/#{site.lang}", site_path( site )
+                = link_to '[~]', edit_site_path( site )
+              (R#{site.reports.count}) (G#{site.galleries.count}) (V#{site.videos.count})
+      - if (index + 1 ) % per_row == 0
         .clearfix
         

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

@@ -1,8 +1,8 @@
 
 .manager-sites-show
   = render 'title', :site => @site    
-  = render 'ish_manager/features/index',  :features => @features, :site => @site
-  = render 'ish_manager/newsitems/index', :newsitems => @newsitems, :site => @site
+  = render 'ish_manager/features/index',  :features  => @features.limit(@site.n_features),   :site => @site
+  = render 'ish_manager/newsitems/index', :newsitems => @newsitems.limit(@site.n_newsitems), :site => @site
       
   .row
     .col-sm-6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.52
+  version: 0.1.8.53
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails