wco_models 3.1.0.140 → 3.1.0.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9e988a7e44625ce410a082ccf9055608a690320c5d2e5d4fe86a3d95284a5d
-  data.tar.gz: ab13367e43002f64bac72f54c668a2dfcbcc9296359c651273c6c0c8fd645564
+  metadata.gz: 416492ad97851c4301c4bf4554ad88bf6f98b0c98a87fa47666b6958c3bab337
+  data.tar.gz: 2288a79fef2d8c98e9bc9587e459515e802d2cf4e393976f9c810254cc0d0296
 SHA512:
-  metadata.gz: 24ee85d5971e231eb4607794fe7d75d7f1780f310bbfc15e6e0888888edc88dcdf0b593cf4d6dfdc461e5ed845c6bd27bbd5042127fa6a1c4202b11e28d5d61f
-  data.tar.gz: effca0d00789c5649feed0ac7e3313adab6e0f904cd167eb42916e3417c2e87e5814f0e199c2f88433c6851e86a7561d7ab95052bdb7f67f8dd54305427666f9
+  metadata.gz: '08e838000f036f91ff65b33e261a5559000c5683c1ec246ab16011cbe85af8aa90491cc1654635ac2e288a47d3697ced7e52b2db95e0b581c53277f6ddd63745'
+  data.tar.gz: fb84b9bdbdae14145fee0f1773512019db8f73b1b9c0ebb02af6662c93502bf3b5607b8371f59ece21fff747a8b2d43230b82b8b61d59755ba6df784b618dae6

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

@@ -15,6 +15,7 @@
   display: inline-block;
 
   height: 32px;
+  line-height: 32px;
 
   margin-right: 32px;
   margin-bottom: 0.3em;

data/app/controllers/wco/galleries_controller.rb

@@ -170,6 +170,7 @@ class Wco::GalleriesController < Wco::ApplicationController
 
   def set_lists
     @galleries_list = Wco::Gallery.list
+    @tags_list = Wco::Tag.list
   end
 
 end

data/app/controllers/wco/tags_controller.rb

@@ -40,6 +40,28 @@ class Wco::TagsController < Wco::ApplicationController
     @new_tag = Wco::Tag.new
   end
 
+  def add_to
+    @tag = Wco::Tag.find params[:id]
+    resource = params[:resource].constantize.find params[:resource_id]
+    authorize! :update, @tag
+
+    resource.tags.push @tag
+    flag = resource.save
+    flash_notice 'maybe?'
+    redirect_to request.referrer
+  end
+
+  def remove_from
+    @tag = Wco::Tag.find params[:id]
+    resource = params[:resource].constantize.find params[:resource_id]
+    authorize! :update, @tag
+
+    resource.tags.delete @tag
+    flag = resource.save
+    flash_notice 'maybe?'
+    redirect_to request.referrer
+  end
+
   def show
     @tag = Wco::Tag.find params[:id]
     authorize! :show, @tag

data/app/helpers/wco/application_helper.rb

@@ -37,8 +37,8 @@ module Wco::ApplicationHelper
   end
   def pp_money a; pp_amount a; end
   def pp_currency a; pp_amount a; end
-  def pp_percent a
-    "#{(a*100).round(2)}%"
+  def pp_percent a, config = { precision: 2}
+    "#{(a*100).round( config[:precision] )}%" rescue '@TODO'
   end
 
 end

data/app/views/wco/_main_footer.haml

@@ -29,6 +29,7 @@
         .col-sm-4
           = render '/wco/profiles/form_extra', profile: @current_profile
           = link_to 'RTEditor', wco.application_tinymce_path, target: :_blank
+      = render 'wco/application/debug' if !Rails.env.production?
 
     .c
-    = render 'wco/application/debug' if !Rails.env.production?
+

data/app/views/wco/_main_header.haml

@@ -33,7 +33,7 @@
         %li= render '/wco/sites/header'
         %li= render '/wco/headlines/header'
         %li= render '/wco/publishers/header'
-        %li= render '/wco/galleries/header'
+        %li= render '/wco/galleries/header_mini'
         %li= render '/wco/reports/header'
         %li= render '/wco/videos/header'
 

data/app/views/wco/_select_all.haml

@@ -1,5 +1,5 @@
 
 .d-flex
-  .label Select All
+  .label.mini All
   = check_box_tag :select_all
   .n-selected -

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

@@ -1,8 +1,22 @@
 
-- galleries ||= Wco::Gallery.all
+.galleries--header
+  %h2.title
+    Gallery
+    = link_to gallery.name, gallery_path(gallery)
+    (#{gallery.photos.length})
+    = link_to '[~]', edit_gallery_path( gallery )
+    .d-inline-block= button_to 'x', gallery_path(gallery), method: :delete, data: { confirm: 'Are you sure?' }
+    - if gallery.is_public
+      %i.material-icons visibility
+    - else
+      %i.material-icons visibility_off
+  = render 'meta', :item => gallery
+
+  = render '/wco/tags/list_mini', tags: gallery.tags, resource: gallery
+
+  %ul
+    %li slug :: #{gallery.slug}
+    %li subhead :: #{gallery.subhead}
+    %li deleted_at ::#{gallery.deleted_at}
+
 
-= link_to "Galleries (#{galleries.length})", wco.galleries_path
-.d-inline-block
-  = form_tag wco.galleries_path, method: :get do
-    = text_field_tag :q
-= link_to '[+]', wco.new_gallery_path

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

@@ -0,0 +1,8 @@
+
+- galleries ||= Wco::Gallery.all
+
+= link_to "Galleries (#{galleries.length})", wco.galleries_path
+.d-inline-block
+  = form_tag wco.galleries_path, method: :get do
+    = text_field_tag :q
+= link_to '[+]', wco.new_gallery_path

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

@@ -8,16 +8,13 @@
 
 
 .galleries--index.maxwidth
-  = render '/wco/galleries/header', galleries: galleries
+  = render '/wco/galleries/header_mini', galleries: galleries
 
   .padded
     - if galleries.length > 0
       = form_tag update_galleries_path do
-        - @tags.each do |tag|
 
-          .Chip
-            = check_box_tag 'tag_ids[]', tag.id
-            = tag
+        = render '/wco/tags/list_mini', tags: @tags
 
         = submit_tag 'Add Tags', data: { confirm: 'Are you sure?' }
           

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

@@ -5,7 +5,7 @@
 .galleries-show.padded
   .row
     .col-md-6
-      = render 'title', gallery: @gallery
+      = render 'header', gallery: @gallery
     .col-md-6
       = render 'wco/photos/multinew', gallery: @gallery
 

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

@@ -0,0 +1,18 @@
+
+
+-# <b>Tags (#{tags.length}):</b>
+-# - cache cache_key do
+.Tags.chips.mb-2
+  - tags.each do |tag|
+    .Chip{ data: { tag: { id: tag.id.to_s } } }
+      - if !config&.without_checkbox
+        = check_box_tag 'tag_ids[]', tag.id
+      = link_to tag.slug, wco.tag_path( tag )
+      - if defined? resource
+        .mini.d-inline-block= button_to 'x', remove_tag_from_path(id: tag.id, resource: resource.class, resource_id: resource.id, ), method: 'delete', data: { confirm: 'Are you sure?' }
+
+  - if defined? resource
+    = form_tag add_tag_to_path( resource: resource.class, resource_id: resource.id ) do
+      = select_tag :id, options_for_select( @tags_list )
+      = submit_tag '+Tag', data: { confirm: 'Are you sure?' }
+

data/app/views/wco_email/conversations/_table.haml

@@ -40,7 +40,7 @@
             -#     = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
 
           %td.tags.mini
-            = render '/wco/tags/chips', tags: conv.tags, cache_key: conv.cache_key
+            = render '/wco/tags/list_mini', tags: conv.tags, cache_key: conv.cache_key, config: OpenStruct.new( without_checkbox: true )
           %td.latest-at
             = pp_date conv.latest_at
             = pp_time conv.latest_at

data/config/routes.rb

@@ -56,6 +56,8 @@ Wco::Engine.routes.draw do
   resources :sites
   resources :subscriptions
 
+  delete 'tags/remove/:id/from/:resource/:resource_id', to: 'tags#remove_from', as: :remove_tag_from
+  post   'tags/add-to/:resource/:resource_id', to: 'tags#add_to', as: :add_tag_to
   resources :tags
 
   ## In order to have unsubscribes_url , unsubscribes must be in wco .

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.140
+  version: 3.1.0.142
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -492,10 +492,10 @@ files:
 - app/views/wco/application/tinymce.html.erb
 - app/views/wco/galleries/_form.haml
 - app/views/wco/galleries/_header.haml
+- app/views/wco/galleries/_header_mini.haml
 - app/views/wco/galleries/_index.haml
 - app/views/wco/galleries/_menu_secondary.haml
 - app/views/wco/galleries/_thumbs.haml
-- app/views/wco/galleries/_title.haml
 - app/views/wco/galleries/edit.haml
 - app/views/wco/galleries/new.haml
 - app/views/wco/galleries/show.haml
@@ -591,11 +591,9 @@ files:
 - app/views/wco/sites/edit.haml
 - app/views/wco/sites/index.haml
 - app/views/wco/sites/new.haml
-- app/views/wco/tags/_chips.haml
 - app/views/wco/tags/_form.haml
 - app/views/wco/tags/_header.haml
 - app/views/wco/tags/_index.haml
-- app/views/wco/tags/_index_inline.haml
 - app/views/wco/tags/_list_mini.haml
 - app/views/wco/tags/edit.haml
 - app/views/wco/tags/index.haml

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

@@ -1,19 +0,0 @@
-
-.galleries--title
-  %h2
-    Gallery
-    = link_to gallery.name, gallery_path(gallery)
-    (#{gallery.photos.length})
-    = link_to '[~]', edit_gallery_path( gallery )
-    .d-inline-block= button_to 'x', gallery_path(gallery), method: :delete, data: { confirm: 'Are you sure?' }
-    - if gallery.is_public
-      %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}
-    %li= render 'meta', :item => gallery

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

@@ -1,6 +0,0 @@
-
-- cache cache_key do
-  .tags--chips
-    - tags.each do |tag|
-      .mb-1
-        .Chip{ data: { tag: { id: tag.id.to_s } } }= tag.slug

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

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

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

@@ -1 +0,0 @@
-app/views/wco/tags/_index_inline.haml