wco_models 3.1.0.141 → 3.1.0.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ba532da884be707b7fac5365a23c346df65965efa7a6b53a16d50d73f7fe476
-  data.tar.gz: 50f746e36a2a6c4cb6cf1526905027d60169c394e8bb9c95f496d836e3059667
+  metadata.gz: 416492ad97851c4301c4bf4554ad88bf6f98b0c98a87fa47666b6958c3bab337
+  data.tar.gz: 2288a79fef2d8c98e9bc9587e459515e802d2cf4e393976f9c810254cc0d0296
 SHA512:
-  metadata.gz: dbc25645c7e5ee4e3749a4ea996461d0fd4a8d7a66710660b487e84819b506abece3a0545d8b7e27303b69656115a30e1ca46b6c542bf114fc969ff325ee9016
-  data.tar.gz: 214a60d7d891227dbcfd6442e34fb19651e09c272ebfda3d5867e388c7fda7f01d4e557dba6599571623411f7c00a603fdb4c64bb0a272cadcc7c341c8584ccf
+  metadata.gz: '08e838000f036f91ff65b33e261a5559000c5683c1ec246ab16011cbe85af8aa90491cc1654635ac2e288a47d3697ced7e52b2db95e0b581c53277f6ddd63745'
+  data.tar.gz: fb84b9bdbdae14145fee0f1773512019db8f73b1b9c0ebb02af6662c93502bf3b5607b8371f59ece21fff747a8b2d43230b82b8b61d59755ba6df784b618dae6

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/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/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,7 +8,7 @@
 
 
 .galleries--index.maxwidth
-  = render '/wco/galleries/header', galleries: galleries
+  = render '/wco/galleries/header_mini', galleries: galleries
 
   .padded
     - if galleries.length > 0

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

@@ -8,4 +8,11 @@
       - 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/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.141
+  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

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