wco_models 3.1.0.145 → 3.1.0.146

data/app/assets/javascripts/wco/application.js

@@ -5,6 +5,7 @@
 //= require ../vendor/bootstrap-4.6.2.min
 //= require ../vendor/select2-4.0.0
 //= require ../vendor/jquery.dataTables-1.10.16
+//= require ../vendor/jquery-ui@1.13.2.js
 //
 // Skip for now b/c I need to move fonts, too:
 // require ../vendor/summernote-0.8.18
@@ -28,6 +29,11 @@
 
 $(function() {
 
+  /* sortable */
+  $( function() {
+    $( ".orderable-items" ).sortable();
+  } );
+
 /* DataTable */
 if ('function' === typeof $('body').DataTable) {
   const _props = {

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

@@ -114,7 +114,7 @@ textarea.monospace {
 
 .gray,
 .grey {
-  color: grey;
+  color: #999;
   display: inline-block;
 }
 

data/app/controllers/wco/galleries_controller.rb

@@ -93,12 +93,12 @@ class Wco::GalleriesController < Wco::ApplicationController
 
   def update_ordering
     authorize! :update, @gallery
-    out = []
-    params[:gallery][:sorted_photo_ids].each_with_index do |id, idx|
-      out.push Photo.find( id ).update_attribute( :ordering, idx )
+    flags = []
+    params[:ids].each_with_index do |id, idx|
+      flags.push Wco::Photo.find( id ).update( weight: idx )
     end
-    flash[:notice] = "Outcomes: #{out}."
-    redirect_to action: 'show', id: @gallery.id
+    flash_notice "Ordering photos: #{flags}"
+    redirect_to request.referrer
   end
 
   def update

data/app/controllers/wco/photos_controller.rb

@@ -66,12 +66,14 @@ class Wco::PhotosController < Wco::ApplicationController
     authorize! :move, Wco::Photo
     photos  = Wco::Photo.where({ :id.in => params[:ids] })
 
-    flag = photos.update_all({ gallery_id: params[:gallery_id] })
-    if flag
-      flash_notice 'ok'
+    if params['delete'] == '1'
+      flash_notice 'deleting'
+      flag = photos.map &:delete
     else
-      flash_alert 'not ok'
+      flag = photos.update_all({ gallery_id: params[:gallery_id] })
+      flash_notice 'moving'
     end
+    flash_notice flag
     redirect_to request.referrer
   end
 

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

@@ -21,34 +21,31 @@
           = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
 
   .row-thumbs
-    %i.fa.fa-expand.collapse-expand#rowMovableThumbs Movable Thumbs
-    .orderable-items{ data: { id: @gallery.id.to_s, slug: @gallery.slug, token: form_authenticity_token } }
-      = form_tag wco.move_photos_path, { method: :post } do
-        .d-flex
-          = select_tag :gallery_id, options_for_select(@galleries_list), class: 'select2'
-          = submit_tag 'Move', data: { confirm: 'Are you sure?' }
-        .d-flex.items
-          - @photos.each do |photo|
-            .itemW
-              = check_box_tag 'ids[]', photo.id
-              .item{ data: { id: photo.id.to_s } }
-                = image_tag photo.photo.url( :thumb )
+    %i.fa.fa-expand.collapse-expand#rowMovableThumbs Deletable, Movable Thumbs
+    = form_tag wco.move_photos_path, { method: :post } do
+      .d-flex
+        = select_tag :gallery_id, options_for_select(@galleries_list), class: 'select2'
+        = check_box_tag :delete
+        %label Delete?
+        = submit_tag 'Delete or Move', data: { confirm: 'Are you sure?' }
+      .d-flex.items
+        - @photos.each do |photo|
+          .itemW
+            = check_box_tag 'ids[]', photo.id
+            .item{ data: { id: photo.id.to_s } }
+              = image_tag photo.photo.url( :thumb )
 
   .row-thumbs
-    %i.fa.fa-expand.collapse-expand#rowOrderableThumbs Orderable, Deletable Thumbs
-    .orderable-items{ data: { id: @gallery.id.to_s, slug: @gallery.slug, token: form_authenticity_token } }
-      = form_tag wco.delete_photos_path, { method: :delete } do
-        = submit_tag 'Delete', data: { confirm: 'Are you sure?' }
-        = button_tag 'Save ordering', class: 'save-ordering'
-        .d-flex.items
-          - @photos.each do |photo|
-            .itemW
-              %a.mvLeft <
-              %a.mvRight >
-              .item{ data: { id: photo.id.to_s } }
-                = check_box_tag 'ids[]', photo.id
-                = render 'wco/photos/meta_manager', photo: photo
-                = image_tag photo.photo.url( :thumb )
+    %i.fa.fa-expand.collapse-expand#rowOrderableThumbs Orderable Thumbs
+    = form_tag wco.update_ordering_photos_path do
+      = hidden_field_tag :id, @gallery.id
+      = submit_tag 'Save ordering', class: 'save-ordering', data: { confirm: 'Are you sure?' }
+      .d-flex.items.orderable-items{ data: { id: @gallery.id.to_s, slug: @gallery.slug, token: form_authenticity_token } }
+        - @photos.each do |photo|
+          .item{ data: { id: photo.id.to_s } }
+            = hidden_field_tag 'ids[]', photo.id
+            = render 'wco/photos/meta_manager', photo: photo
+            = image_tag photo.photo.url( :thumb )
 
 
 
@@ -58,5 +55,6 @@
       - @photos.each do |photo|
         .item
           %a{id: "large_#{photo.id}" }
+          = button_to '[x]', photo_path( :id => photo.id ), class: 'x', :method => :delete, :data => { :confirm => 'Are you sure?' }
           = render 'wco/photos/meta_manager', photo: photo
           .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

data/app/views/wco/photos/_meta_manager.haml

@@ -1,6 +1,6 @@
 
 .photos--meta-manager
-  = button_to '[x]', photo_path( :id => photo.id ), class: 'x', :method => :delete, :data => { :confirm => 'Are you sure?' }
+  -# = button_to '[x]', photo_path( :id => photo.id ), class: 'x', :method => :delete, :data => { :confirm => 'Are you sure?' }
   .right-hand
     = link_to "Goto", "#large_#{photo.id}", class: 'goto'
     = link_to "Lg", photo.photo.url(:large)

data/config/routes.rb

@@ -46,6 +46,7 @@ Wco::Engine.routes.draw do
   post 'publishers/:id/do-run', to: 'publishers#do_run', as: :run_publisher
   resources :publishers
 
+  post   'photos/update-ordering', to: 'galleries#update_ordering', as: :update_ordering_photos
   post   'photos/move',   to: 'photos#move',    as: :move_photos
   delete 'photos/delete', to: 'photos#destroy', as: :delete_photos
   resources :photos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.145
+  version: 3.1.0.146
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -371,6 +371,7 @@ files:
 - app/assets/javascripts/vendor/jquery-3.3.1.slim.min.js
 - app/assets/javascripts/vendor/jquery-3.4.1.min.js
 - app/assets/javascripts/vendor/jquery-ui.min.js
+- app/assets/javascripts/vendor/jquery-ui@1.13.2.js
 - app/assets/javascripts/vendor/jquery.dataTables-1.10.16.js
 - app/assets/javascripts/vendor/jquery.dataTables-1.10.16.min.js
 - app/assets/javascripts/vendor/jquery.fileupload.js