wco_models 3.1.0.125 → 3.1.0.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99f8129b7cec8ec5a66f1f3a4d76187a409f8150393a22f188a54d836588992
-  data.tar.gz: d6b6db0666e97136a3b801cf45e06b8b88fd1fec00b5c567fc84408d6b838cbd
+  metadata.gz: 4b2ddd5c01dd7dde872b1e8203be3ae681c2e5cb5f227dd0ae464f77e44fd49b
+  data.tar.gz: 55eeacdf564b1394a426faec3160604df1b97e96574c95e9172cf638d1b3e8b9
 SHA512:
-  metadata.gz: 130d4a8b5404efe7e2e7442dc5a90204a26fb061d8195f7fd1ccf6a9efd69e401e40819af6672b79a8759362df9c79a76649b5c4228206571eff5a8a48d082b2
-  data.tar.gz: 44057b7cb424c52389044e0d73755c82ba26794ae88be980364281abaa62306832ae0ce4803666e218db0b93b636c9aa8a25ad79534e0ae033ae17bec6730e1e
+  metadata.gz: f4ecb3a2f26f9bb005c1dacb8ec40304f451a9ecf5698a088dee4ee9344cf4fee0bd5effdee8f9a7f21efb16f3ba030aebcf1191968cc5cbf14495658d2a7551
+  data.tar.gz: e5d4cac4740bb1b8848423379c4b3d33b1387ced1902dc953a7c2bca99b4864098c604393cf18a009575259de49aa4c21916073d36dd1f4dae570ae55e333c51

data/app/controllers/wco/galleries_controller.rb

@@ -86,8 +86,8 @@ class Wco::GalleriesController < Wco::ApplicationController
 
   def show
     authorize! :show, @gallery
-    @photos = @gallery.photos.unscoped.where({ :is_trash => false }).order_by( ordering: :asc )
-    @deleted_photos = @gallery.photos.unscoped.where({ :is_trash => true }).order_by( ordering: :asc )
+    @photos = @gallery.photos.order_by( ordering: :asc )
+    @deleted_photos = @gallery.photos.deleted.order_by( ordering: :asc )
   end
 
   def update_ordering

data/app/models/wco_hosting/serverhost.rb

@@ -85,7 +85,8 @@ class WcoHosting::Serverhost
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )
     ac.instance_variable_set( :@workdir, WORKDIR )
-    rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-#{app.tmpl.kind}")
+    # rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-#{app.tmpl.kind}")
+    rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-any")
     Wco::Log.puts! rendered_str, 'add_docker_service rendered_str', obj: @obj
 
     file = Tempfile.new('prefix')

data/app/views/wco_hosting/scripts/create_volume.erb

@@ -1,19 +1,22 @@
 #!/bin/bash
 
+function download { name="$(basename $1)"; curl "$1" > "$name"; }
+export filename="$(basename <%= @app.tmpl.volume_zip %>)"
+
 set -ex
 
 cd <%= @workdir %>
 rm -rf __MACOSX
 
 ## cache/overwrite
-[ ! -e <%= @app.kind %>__prototype.zip ] && curl <%= @app.tmpl.volume_zip %> > <%= @app.kind %>__prototype.zip
-#                                           curl <%= @app.tmpl.volume_zip %> > <%= @app.kind %>__prototype.zip
+[ ! -e $filename ] && curl <%= @app.tmpl.volume_zip %> > $filename
+#                     curl <%= @app.tmpl.volume_zip %> > $filename
 
 ## cache/overwrite
-[ ! -e <%= @app.kind %>__prototype     ] && rm -rf <%= @app.kind %>__prototype && unzip -o <%= @app.kind %>__prototype.zip
-#                                           rm -rf <%= @app.kind %>__prototype && unzip -o <%= @app.kind %>__prototype.zip
+[ ! -e build ] && unzip -o $filename -d build
+# rm -rf build && unzip -o $filename -d build
 
-mv  <%= @app.kind %>__prototype ./volumes/<%= @app.service_name %>_data
+mv  build ./volumes/<%= @app.service_name %>_data
 
 set +ex
 echo ok #create_volume

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.125
+  version: 3.1.0.127
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-03 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3