wco_models 3.1.0.136 → 3.1.0.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4aca388a9b787126a677bc0a0dada925305f24381f879dc7df154179e968381
-  data.tar.gz: b2d6f9d703ab36d7bbdb1ce87940f516b96ff9e9c288a9f201bf8d712e3f4bb2
+  metadata.gz: 632761ee3733fa6dfa80381c4e542ced567f4ef571d3bd2cc14bd649f46c91b7
+  data.tar.gz: c597ae263f07ce7b48a86d0f95890a159a63d0275f2f56fe1ea46108bb3380c4
 SHA512:
-  metadata.gz: 102c9769aa8cff0861ca10a8a63774da3d17686dc36ffc1f2a3bcb290504c4263fcc3d2a4149ca5796fd6c5406b24ce314f5bcdb1e479ec824fc743ca7432970
-  data.tar.gz: c79fa5615fe7d33f5ca72b56934c71934177f9f70d3cfad6d1af54a43dc801c6eab1895a4dbe4243b960ee98fc49cdaea6b8c436dd2c344375961d3a9dda75e8
+  metadata.gz: '08fdf497885da8ba2afe8ea69995a21152f565811e2d1ab584abdad2087f4ac836169d67ad489ba517c8357286d47eb17a6a0b8023afb45fb75ef05be13dccd0'
+  data.tar.gz: '0778143ba46e945b64d8f2da6eb52afb9486ce60e427c843e613b8535d705c98801e3b1d852bd4bbc963bc992f8aa61d17d3f3cc29adafe0954429acf8de2caf'

data/app/assets/stylesheets/wco/chip.scss

@@ -12,12 +12,12 @@
     color: var(--wco-color-2contrast);
   }
 
-  display: inline;
+  display: inline-block;
 
   height: 32px;
 
   margin-right: 32px;
-  margin-bottom: 0.1em;
+  margin-bottom: 0.3em;
 
   padding: 0.1em .3em;
   padding: 0.2em 0.2em 0.2em 0.6em;

data/app/controllers/wco/galleries_controller.rb

@@ -44,14 +44,15 @@ class Wco::GalleriesController < Wco::ApplicationController
     @page_title = 'Galleries'
     @galleries = Wco::Gallery.all.order_by( :created_at => :desc )
 
+    @tags = Wco::Tag.all
+
     if params[:q]
       q = URI.decode(params[:q])
       @galleries = @galleries.where({ :name => /#{q}/i })
     end
 
     @galleries = @galleries.page( params[:galleries_page] ).per( current_profile.per_page )
-
-    render "_index"
+    render '_index'
   end
 
   def j_show
@@ -127,6 +128,31 @@ class Wco::GalleriesController < Wco::ApplicationController
     end
   end
 
+  def update_many
+    authorize! :update, Wco::Gallery
+    galleries = Wco::Gallery.where( :id.in => params[:gallery_ids] )
+
+    tags = Wco::Tag.where( :id.in => params[:tag_ids] )
+
+    if params[:remove]
+      galleries.each do |gallery|
+        tags.each do |tag|
+          gallery.tags.delete tag
+        end
+        gallery.save
+      end
+    else
+      galleries.each do |gallery|
+        gallery.tags.push tags
+        gallery.save
+      end
+    end
+
+    flash_notice 'Unknown outcome, no exception raised.'
+    redirect_to request.referrer
+  end
+
+
   ##
   ## private
   ##

data/app/controllers/wco/tags_controller.rb

@@ -1,6 +1,8 @@
 
 class Wco::TagsController < Wco::ApplicationController
 
+  before_action :set_lists, only: %i| show |
+
   def create
     @tag = Wco::Tag.new params[:tag].permit!
     authorize! :create, @tag
@@ -42,7 +44,12 @@ class Wco::TagsController < Wco::ApplicationController
     @tag = Wco::Tag.find params[:id]
     authorize! :show, @tag
 
-    @reports = @tag.reports.page( params[:reports_page] ).per( current_profile.per_page )
+    @galleries = @tag.galleries(
+      ).page( params[:galleries_page] ).per( current_profile.per_page )
+
+    @reports = @tag.reports(
+      ).page( params[:reports_page] ).per( current_profile.per_page )
+
   end
 
   def update
@@ -56,4 +63,14 @@ class Wco::TagsController < Wco::ApplicationController
     redirect_to action: 'index'
   end
 
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    @tags = Wco::Tag.all
+  end
+
+
 end

data/app/models/wco/gallery.rb

@@ -51,6 +51,9 @@ class Wco::Gallery
     %w| name subhead descr |
   end
 
+  has_and_belongs_to_many :tags
+
+
   has_many :oats, class_name: 'Wco::OfficeActionTemplate'
 
 end

data/app/models/wco/tag.rb

@@ -18,7 +18,9 @@ class Wco::Tag
   has_and_belongs_to_many :headlines # ,     class_name: 'Headline'
   has_and_belongs_to_many :leads, index: true # ,         class_name: 'Lead'
   has_and_belongs_to_many :leadsets # ,      class_name: 'Leadset'
+  has_and_belongs_to_many :galleries
   has_and_belongs_to_many :reports
+  has_and_belongs_to_many :videos
   has_and_belongs_to_many :logs
 
   INBOX = 'inbox'

data/app/models/wco/video.rb

@@ -32,6 +32,9 @@ class Wco::Video
   # belongs_to :user_profile,                  :class_name => 'Ish::UserProfile', :inverse_of => :videos
   # has_and_belongs_to_many :shared_profiles,  :class_name => 'Ish::UserProfile', :inverse_of => :shared_videos
 
+  has_and_belongs_to_many :tags
+
+
   has_mongoid_attached_file :video,
     # styles: { :thumb => { geometry: '192x108', format: 'jpeg' }, },
     # processors: [ :transcoder ],

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

@@ -8,37 +8,48 @@
 
 
 .galleries--index.maxwidth
-  = render 'header', galleries: galleries
+  = render '/wco/galleries/header', galleries: galleries
 
   .padded
     - if galleries.length > 0
-      - if galleries.respond_to? :total_pages
-        = paginate galleries, :param_name => :galleries_page, :views_prefix => 'wco'
-
       = form_tag update_galleries_path do
-        = select_tag 'tag_ids[]', options_for_select([ nil, 1 ]), { multiple: true }
-        = submit_tag 'Add Tags'
-
-        .row
-          - galleries.each do |g|
-            .col-sm-12.col-md-6
-              .Card
-                %h5
-                  = check_box_tag 'ids[]', g.id
-                  = link_to '[~]', edit_gallery_path( g )
-                  = link_to g.name, gallery_path(g.slug)
-                  (#{g.photos.length})
-                = render 'meta', item: g
-                - if g.photos.length == 0
-                  No Photos
-                - else
-                  .d-flex.flex-wrap.photos-thumbs
-                    - g.photos.limit( @current_profile.show_n_thumbs ).each do |photo|
-                      = link_to image_tag(photo.photo.url(:thumb), :alt => ''), gallery_path(g.slug)
+        - @tags.each do |tag|
+
+          .Chip
+            = check_box_tag 'tag_ids[]', tag.id
+            = tag
+
+        = submit_tag 'Add Tags', data: { confirm: 'Are you sure?' }
+          
+        %label remove?
+        = check_box_tag :remove
+        = submit_tag 'Tags', data: { confirm: 'Are you sure?' }
 
         - if galleries.respond_to? :total_pages
           = paginate galleries, :param_name => :galleries_page, :views_prefix => 'wco'
 
+          .row
+            - galleries.each do |g|
+              .col-sm-12.col-md-6
+                .Card
+                  %h5
+                    = check_box_tag 'gallery_ids[]', g.id
+                    = link_to '[~]', edit_gallery_path( g )
+                    = link_to g.name, gallery_path(g.slug)
+                    (#{g.photos.length})
+                  = render 'meta', item: g
+                  - if g.photos.length == 0
+                    No Photos
+                  - else
+                    .d-flex.flex-wrap.photos-thumbs
+                      - g.photos.limit( @current_profile.show_n_thumbs ).each do |photo|
+                        = link_to image_tag(photo.photo.url(:thumb), :alt => ''), gallery_path(g.slug)
+
+          - if galleries.respond_to? :total_pages
+            = paginate galleries, :param_name => :galleries_page, :views_prefix => 'wco'
+
     - else
-      %h5 No Galleries
+      .p No Galleries
+
+
 

data/app/views/wco/galleries/_title.haml

@@ -10,6 +10,9 @@
       %i.material-icons visibility
     - else
       %i.material-icons visibility_off
+
+  = render '/wco/tags/list_mini', tags: gallery.tags
+
   %ul
     %li slug :: #{gallery.slug}
     %li subhead :: #{gallery.subhead}

data/app/views/wco/tags/_index_inline.haml

@@ -1,10 +1,7 @@
 
 
-.Tags.mb-2
+.Tags.chips.mb-2
   <b>Tags (#{tags.length}):</b>
   - tags.each_with_index do |tag, idx|
-    = link_to tag.slug, wco.tag_path(tag)
-    - if idx+1 == tags.length
-      \.
-    - else
-      \,&nbsp;
+    .Chip
+      = link_to tag.slug, wco.tag_path(tag)

data/app/views/wco/tags/show.haml

@@ -12,6 +12,9 @@
     %li.d-flex
       <b>Headlines (#{@tag.headlines.length}):&nbsp;</b>
       = render '/wco/headlines/index', headlines: @tag.headlines
+    %li.d-flex
+      <b>Galleries (#{@galleries.length}):&nbsp;</b>
+      = render 'wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
     %li.d-flex
       <b>Reports (#{@reports.length}):&nbsp;</b>
       = render 'wco/reports/list', reports: @reports, config: { skip_tags: true }

data/config/routes.rb

@@ -11,7 +11,7 @@ Wco::Engine.routes.draw do
   resources :assets
   # get 'assets/:id', to: 'assets#show', as: :asset
 
-  post 'galleries/update', to: 'galleries#update', as: :update_galleries
+  post 'galleries/update', to: 'galleries#update_many', as: :update_galleries
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.136
+  version: 3.1.0.137
 platform: ruby
 authors:
 - Victor Pudeyev