wco_models 3.1.0.146 → 3.1.0.148

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd48f5f6cbeccdf413bedcd4358c62a04b8732fe8f75bb785c09e0222810a195
-  data.tar.gz: 64bf32188f9c2be4a0be446bd23a86e038cfd86e3e5b6a1398b31c601a129da5
+  metadata.gz: 6d659451d072adbf696dd6a317cb383990bd0d8da8460b984c38f4adc7c867ff
+  data.tar.gz: 80b994dce92435205be381c9fb1b83f8fe889f9e7b455766cf133576a910de7e
 SHA512:
-  metadata.gz: 0772a4d001ca41e254a776757734f312108f9dfb67c2bc73ac1ad5a812d00bc91cfbec727125835f48ac8c1004bad6fb9f22dd1e497cbedd9212cc32b0c770f5
-  data.tar.gz: 7e4c728c3cb83079b473f8990749e5d9edc328b759a8ba603a49e21472fbf7523cee1dbf2709167a0debe1ee1a229805991ba3d393cb92012d9431b07f47f6b4
+  metadata.gz: c5d4f74a454d00bda9c508502dcde00fcea82ab1ff2b07bf34176780127402e1d0788eec5fa4c9ec0df897d0fb6929edc15f8c0fda7c5cbfec33397efea190fb
+  data.tar.gz: dd976a05848a79c8fdd07820ccec5a0244892309d79cf3b1c6911f42f859d29fe76d7366168600ae1b145919335db004d60c278c17a63ec2df2252737d71e19a

data/app/controllers/wco/application_controller.rb

@@ -17,6 +17,7 @@ class Wco::ApplicationController < ActionController::Base
   check_authorization
 
   before_action :current_profile
+  before_action :set_lists
 
   def home
     authorize! :home, Wco
@@ -80,4 +81,7 @@ class Wco::ApplicationController < ActionController::Base
     ["1", "t", "T", "true"].include?( which )
   end
 
+  def set_lists
+  end
+
 end

data/app/controllers/wco/galleries_controller.rb

@@ -1,7 +1,6 @@
 
 class Wco::GalleriesController < Wco::ApplicationController
 
-  before_action :set_lists, only: %i| show |
   before_action :set_gallery, only: %w| destroy edit j_show show update update_ordering |
 
   # Alphabetized! : )

data/app/controllers/wco/leads_controller.rb

@@ -26,10 +26,14 @@ class Wco::LeadsController < Wco::ApplicationController
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.all
 
+
+
     if params[:q].present?
+      q = params[:q].downcase
       @leads = @leads.any_of(
-        { email: /#{params[:q].downcase}/i },
-        { name:  /#{params[:q].downcase}/i } )
+        { email: /#{q}/i },
+        { name:  /#{q}/i },
+      );
 
       if 1 == @leads.length
         redirect_to controller: 'wco/leads', action: 'show', id: @leads[0].id

data/app/controllers/wco/profiles_controller.rb

@@ -1,6 +1,16 @@
 
 class Wco::ProfilesController < Wco::ApplicationController
 
+  def edit
+    @profile = Wco::Profile.find params[:id]
+    authorize! :update, @profile
+  end
+
+  def index
+    @profiles = Wco::Profile.all
+    authorize! :index, Wco::Profile
+  end
+
   def update
     @profile = Wco::Profile.find params[:id]
     authorize! :update, @profile

data/app/controllers/wco/tags_controller.rb

@@ -1,7 +1,7 @@
 
 class Wco::TagsController < Wco::ApplicationController
 
-  before_action :set_lists, only: %i| show |
+  before_action :set_lists
 
   def create
     @tag = Wco::Tag.new params[:tag].permit!
@@ -37,7 +37,6 @@ class Wco::TagsController < Wco::ApplicationController
 
   def new
     authorize! :new, Wco::Tag
-    @new_tag = Wco::Tag.new
   end
 
   def add_to
@@ -91,7 +90,9 @@ class Wco::TagsController < Wco::ApplicationController
   private
 
   def set_lists
+    @new_tag = Wco::Tag.new
     @tags = Wco::Tag.all.order_by( slug: :asc )
+    @tags_list = Wco::Tag.list
   end
 
 

data/app/models/wco/profile.rb

@@ -16,6 +16,13 @@ class Wco::Profile
   has_many :newsitems, class_name: 'Wco::Newsitem'
   has_and_belongs_to_many :shared_galleries, class_name: 'Wco::Gallery', inverse_of: :shared_profiles
 
+  ROLE_ADMIN = 'admin'
+  ROLE_GUY   = 'guy'
+  ROLES      = [ ROLE_ADMIN, ROLE_GUY ]
+  field :role, type: :string, default: ROLE_GUY
+  def self.roles_list
+    [nil] + ROLES
+  end
 
   def to_s
     email

data/app/models/wco/tag.rb

@@ -9,7 +9,8 @@ class Wco::Tag
   validates :slug, presence: true, uniqueness: true
   index({ slug: -1 })
 
-  # parent-child
+  belongs_to :parent, class_name: 'Wco::Tag', inverse_of: :sons
+  has_many :sons, class_name: 'Wco::Tag', inverse_of: :parent
 
   has_many :email_filters, class_name: 'WcoEmail::EmailFilter', inverse_of: :tag
 

data/app/views/wco/_main_header.haml

@@ -28,6 +28,7 @@
         %li= render '/wco/leads/header'
         %li= render '/wco/office_action_templates/header'
         %li= render '/wco/office_actions/header'
+        %li= render '/wco/profiles/header'
 
       %ul
         %li= render '/wco/sites/header'

data/app/views/wco/profiles/_form.haml

@@ -0,0 +1,9 @@
+
+.profiles--form
+  = form_for profile do |f|
+    .field
+      %label role
+      = f.select :role, options_for_select(Wco::Profile.roles_list, selected: profile.role )
+
+    .actions
+      = f.submit 'Go'

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

@@ -0,0 +1,6 @@
+
+= link_to "Profiles (#{Wco::Profile.all.length})", wco.profiles_path
+.inline-search
+  = form_tag wco.profiles_path, method: :get do
+    = text_field_tag :q
+= link_to '[+]', wco.new_profile_path

data/app/views/wco/profiles/edit.haml

@@ -0,0 +1,6 @@
+
+.profiles-edit.maxwidth
+  .header
+    .title edit profile
+
+  = render 'form', profile: @profile

data/app/views/wco/profiles/index.haml

@@ -0,0 +1,10 @@
+
+.profiles-index.maxwidth
+  .header
+    .title Profiles
+
+  %ul
+    - @profiles.each do |profile|
+      %li
+        = link_to '[~]', edit_profile_path(profile)
+        = profile.email

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

@@ -6,5 +6,9 @@
       %label slug
       = f.text_field :slug
 
+    .field.d-flex
+      %label parent
+      = f.select :parent_id, options_for_select(@tags_list, selected: tag.parent_id ), {}, class: 'select2'
+
     .actions
       = f.submit

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

@@ -1,4 +1,6 @@
 
 .tags-edit.maxwidth
+  .header
+    %h5.title Edit tag `#{@tag}`
 
   = render 'form', tag: @tag

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

@@ -6,4 +6,9 @@
   = render 'index', tags: @tags
 
   %hr
-  = render 'form', tag: Wco::Tag.new
+
+  .tags-new.maxwidth
+    .header
+      %h5.title New tag
+
+    = render 'form', tag: @new_tag

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

@@ -0,0 +1,6 @@
+
+.tags-new.maxwidth
+  .header
+    %h5.title New tag
+
+  = render 'form', tag: @new_tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.146
+  version: 3.1.0.148
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -574,7 +574,11 @@ files:
 - app/views/wco/products/new.haml
 - app/views/wco/products/show.haml
 - app/views/wco/products/show.jbuilder
+- app/views/wco/profiles/_form.haml
 - app/views/wco/profiles/_form_extra.haml
+- app/views/wco/profiles/_header.haml
+- app/views/wco/profiles/edit.haml
+- app/views/wco/profiles/index.haml
 - app/views/wco/publishers/_form.haml
 - app/views/wco/publishers/_header.haml
 - app/views/wco/publishers/edit.haml