ish_manager 0.1.8.162 → 0.1.8.165

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd2921b2b337e4fa8faf74a2c4bc703054c63b6f
-  data.tar.gz: 371c4708b554383a31a116d0c2dbbc771e7bb4ad
+SHA256:
+  metadata.gz: 64e574e150e924874719efe597e531f3f7ea1c7079017c7526b3a9a169d32d58
+  data.tar.gz: bbea52e281fa5f921565135bd8b6d76e8e41196bcd716d305f18535ec946e5b4
 SHA512:
-  metadata.gz: 6465b4fbcf4d4846ac2bc170a264f1b79f1ef035691b0d4013c28a5027925bdbd4d92e7e9529321e017e03be582884c186cea03898c0e7b4c12899525c7b4d06
-  data.tar.gz: 5656e58a69dc6a91f6080c687e299d1f72be9f99a1ffbb92eb055cf44b64ab63ac2c1d4ea21d0d1996780e86ed1f5b5e810b95e810eaecdbc5034daf93826079
+  metadata.gz: 2facaef2a288e8f217d99a88fd0750771b03f6a004a0c6facc65f96cce91404a97f3c43e2032a5a1bf495ffd277ec0649f526eb95d01410efb1973cfed742482
+  data.tar.gz: 33eb5f1c4cf1626bf7478eb6f3bba7aaf7fb1bd50616cca452071192832d9642db7e9d9a740be0a981f823fdca5892543b6853fa7547a9c259c69efa6fbc31e7

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -31,6 +31,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     @resource = Site.find params[:newsitem][:site_id] if !params[:newsitem][:site_id].blank?
     @resource = Tag.find params[:tag_id]              if params[:tag_id]
     @resource = Tag.find params[:newsitem][:tag_id]   if !params[:newsitem][:tag_id].blank?
+    @resource = IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
     @resource.newsitems << @newsitem
 
     authorize! :create_newsitem, @resource
@@ -40,14 +41,18 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem.photo = photo
     end
 
-    case @resource.class.name
+    url = case @resource.class.name
     when "City"
-      url = edit_city_path( @resouce.id )
+      edit_city_path( @resouce.id )
     when "Tag"
-      url = tag_path( @resource.id )
       @resource.site.touch
+      tag_path( @resource.id )
     when "Site"
-      url = edit_site_path( @resource.id )
+      edit_site_path( @resource.id )
+    when "IshModels::UserProfile"
+      user_profiles_path
+    else
+      root_path
     end
     
     flag = @newsitem.save && @resource.save
@@ -139,6 +144,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   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
@@ -149,9 +155,10 @@ 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
+    @sites_list     = Site.list
+    @cities_list    = City.list
+    @tags_list      = Tag.list
+    @user_profiles_list = IshModels::UserProfile.list
   end
 
 end

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -10,24 +10,32 @@
             %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
             %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
             %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
-            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
+            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path
+
           %ul.nav.nav-pills          
             %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
             %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
             %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
             %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
             %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
+
+          %ul.nav.nav-pills
+            %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
+
           %ul.nav.nav-pills
             -# %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
             %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
             %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
             %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
+
           %ul.nav.nav-pills
             %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
             %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
+
           %ul.nav.nav-pills
             %li{ :class => params[:controller] == 'ish_manager/leads'         ? 'active' : '' }= link_to 'Leads', leads_path
             %li{ :class => params[:controller] == 'ish_manager/campaigns'     ? 'active' : '' }= link_to 'Campaigns', campaigns_path
+
           %ul.nav.nav-pills
             %li{ :class => params[:controller] == 'ish_manager/orders'        ? 'active' : '' }= link_to 'Orders', orders_path
             %li{ :class => params[:controller] == 'ish_manager/co_tailors'    ? 'active' : '' }= link_to 'Co Tailors', co_tailors_path

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

@@ -1 +1 @@
-_list.haml
+app/views/ish_manager/galleries/trash/_list.haml

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

@@ -1,33 +1,39 @@
 
 = form_for newsitem, :html => { :multipart => true } do |f|
-  .a
-    = f.label :site
-    = 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_list, :selected => ( @city ? @city.id : nil ) )
-    %br
-    = f.label :tag
-    = f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
+  .row
+    .col-sm-6{ style: 'border-right: 1px solid red;' }
+      = f.label :site
+      = 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_list, :selected => ( @city ? @city.id : nil ) )
+      %br
+      = f.label :tag
+      = f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
+      %br
+      = f.label :user_profile
+      = f.select :user_profile_id, options_for_select( @user_profiles_list )
 
-  .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, :selected => @newsitem.video_id )
-  .a
-    = f.label :gallery
-    = 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, :selected => @newsitem.report_id )
-  .a
-    = label_tag :photo
-    = file_field_tag :photo
+    .col-sm-6
+      = f.label :name
+      = f.text_field :name
+      = f.label :descr
+      = f.text_area :descr, :class => :tinymce
+      = label_tag :photo
+      = file_field_tag :photo
+  %hr
+  .row
+    .col-sm-6
+      = f.label :video
+      = 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, :selected => @newsitem.gallery_id )
+      .a
+      = f.label :report
+      = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
+  .a
+    
   .a
     = f.submit :submit
   

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

@@ -18,10 +18,16 @@
             %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
             %li <b>About:</b> #{profile.about}
         .col-sm-8
-          Shared galleries:<br />
+          %h5 Shared galleries
           - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
             &gt; #{link_to g.name, gallery_path(g.galleryname)} <br />
             = render 'meta', :item => g
+          <hr />
+
+          %h5 Newsitems
+          - profile.newsitems.each do |n|
+            = render 'ish_manager/newsitems/item', n: n
+          <hr />
       .row
         Address:
         = profile.addresses[0].inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.162
+  version: 0.1.8.165
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Summary of IshManager.