ish_manager 0.1.8.381 → 0.1.8.383

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2e5be382bc48dfdf58151137f5038df66d50c386e046cb44a0700fe0b6c3c7
-  data.tar.gz: 361c1da27ebd6b09c154e0a101e65eb7e9c11260411be5847cc6c6bc17c6e710
+  metadata.gz: 3aae4c46f6f96a6a9caa0d44d807ca0f6e84c81d8bce8211bda475be394bf3f5
+  data.tar.gz: c9021cf3ec2a606fc8d6111f1dff32d17094b0fa829b0055304a93f75027c6d2
 SHA512:
-  metadata.gz: 5b0de89b4b160a00565e0806fd5fcf5f9495090c64c040d2f4c06897766ecf8db96e54c0a5e259cbd31fcb79dc43ae9ba2f78e45dc29535cdb0399d1587671e6
-  data.tar.gz: 999d4cff0011f3ad55e53bfa5c26c0432be283f1c811b33719de12aa0dfdd19333ea71143f4655005bb3f32403149b84f9dd60c37fae4e9b78ceef9254fe62c9
+  metadata.gz: 7f4f9255e0fa368ec06d6c1b55f5c93fa2f09ea180f32f41f59f7ce70c3b73c81cd32472258df83a115a5bab3d2e3e2c69a3e076eaf17f3e1cc520c50efab7df
+  data.tar.gz: 6168704327873458aa4c885277e0c96241e721ce97365bbfe9ffb6ab7299d6387cddc296778e6622113469394c514bb1586b99b77b37fd3037704cbf60b84112

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

@@ -33,13 +33,35 @@ const AppRouter = {
 
 $(function () {
 
+  var fileuploadCount = 0
   $('#fileupload').fileupload({
     dataType: 'json',
-    done: function (e, data) {
-      var photos = $('#photos');
-      var tempUrl = data.result[0].thumbnail_url;
-      $('<img/>').attr('src', tempUrl).appendTo(photos);
-    }
+    success: function(ev) {
+      logg(ev, 'success')
+      ev = ev[0]
+      fileuploadCount += 1
+
+      var el = $('<div class="item" />')
+      var photosEl = $('#photos')
+
+      $('<div/>').html(fileuploadCount).appendTo(el)
+      $('<img/>').attr('src', ev.thumbnail_url).appendTo(el)
+      $('<div/>').html(ev.name).appendTo(el)
+      el.appendTo(photosEl)
+    },
+    error: function(err) {
+      logg(err, 'error')
+      err = err.responseJSON
+      fileuploadCount += 1
+
+      var el = $('<div class="item" />')
+      var errorsEl = $('.photos--multinew .errors')
+
+      $('<div/>').html(fileuploadCount).appendTo(el)
+      $('<div />').html(err.filename).appendTo(el)
+      $('<div />').html(err.message).appendTo(el)
+      el.appendTo(errorsEl)
+    },
   });
 
   $('*[data-confirm]').click(function(){
@@ -97,7 +119,6 @@ $(function () {
   })
 
   $(".expand-next").click(function (_e) {
-    // logg($(this).next(), 'expand?')
     $(this).next().slideToggle()
   })
 

data/app/assets/stylesheets/ish_manager/photos.scss

@@ -34,6 +34,17 @@
     overflow-x: auto;
     max-width: Max( 300px, 50vw );
   }
+
+  .errors > div {
+    border: 1px solid red;
+  }
+
+  .thumbnails {
+    .item {
+      border: 1px solid blue;
+    }
+  }
+
 }
 
 .row-deleted {

data/app/controllers/ish_manager/galleries_controller.rb

@@ -3,7 +3,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
   before_action :set_lists
   before_action :set_gallery, only: %w|destroy edit j_show show update update_ordering|
 
-  # alphabetized! : )
+  # Alphabetized! : )
 
   def create
     params[:gallery][:shared_profiles] ||= []
@@ -19,7 +19,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
       redirect_to edit_gallery_path(@gallery)
     else
       puts! @gallery.errors.messages
-      flash[:alert] = "Cannot create the gallery: #{@gallery.errors.full_messages}"
+      flash[:alert] = "Cannot create the gallery: #{@gallery.errors.full_messages.join(', ')}"
       render :action => 'new'
     end
   end

data/app/controllers/ish_manager/photos_controller.rb

@@ -27,11 +27,10 @@ class IshManager::PhotosController < IshManager::ApplicationController
   end
 
   def j_create
-    # find this gallery
     if params[:slug]
       gallery = Gallery.unscoped.where( :slug => params[:slug] ).first
       gallery ||= Gallery.unscoped.find params[:slug]
-    elsif params[:gallery_id] # this one, let's normalize on id everywhere in manager.
+    elsif params[:gallery_id]
       gallery = Gallery.unscoped.find( params[:gallery_id] )
       gallery ||= Gallery.unscoped.where( :slug => params[:gallery_id] ).first
     end
@@ -41,7 +40,6 @@ class IshManager::PhotosController < IshManager::ApplicationController
     @photo.is_public = true
     @photo.gallery = gallery
 
-    # cache
     @photo.gallery.touch
 
     if @photo.save
@@ -55,7 +53,10 @@ class IshManager::PhotosController < IshManager::ApplicationController
       }
       render :json => [ j ]
     else
-      render :json => { "errors" => @photo.errors }
+      render :json => {
+        message: @photo.errors.full_messages.join(", "),
+        filename: @photo.photo.original_filename,
+      }, status: 400
     end
   end
 

data/app/views/ish_manager/email_conversations/show.haml

@@ -17,8 +17,7 @@
   .leads.max-width
     Leads (#{@email_conversation.leads.length}):
     = @email_conversation.leads.map(&:id)
-    .leadsC
-      = render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
+    -# .leadsC= render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
 
   .messages.max-width
     - @email_messages.each do |msg|
@@ -26,21 +25,22 @@
 
       .item
         .row-1
-          .gray= msg.id
-
-          .chip.from
-            = lead.email
-
-          .relative
-            %a.chip{ href: email_contexts_for_lead_path( lead ) }
-              \(
-              = lead.email_contexts.count
-              %i.fa.fa-envelope
-              \)
-
-          .relative
-            %i.fa.fa-clock-o.expand-next
-            .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+          .gray
+            %ul
+              %li
+                = msg.id
+                <b>To:</b> #{msg.to}
+              %li
+                <b>From:</b> #{msg.from}
+                = lead.email
+                %a.chip{ href: email_contexts_for_lead_path( lead ) }
+                  \(
+                  = lead.email_contexts.count
+                  %i.fa.fa-envelope
+                  \)
+                .relative.inline-block
+                  %i.fa.fa-clock-o.expand-next
+                  .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
 
           .datetime
             .date= msg.date&.strftime('%Y-%m-%d')

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

@@ -2,11 +2,11 @@
 -# ish_manager / galleries / show
 -#
 
-.galleries-show
+.galleries-show.padded
   .row
-    .col-sm-12.col-md-6
+    .col-md-6
       = render 'title', :gallery => @gallery
-    .col-sm-12.col-md-6
+    .col-md-6
       = render 'ish_manager/photos/multinew', :gallery => @gallery
 
   .row-deleted

data/app/views/ish_manager/photos/_multinew.haml

@@ -1,5 +1,6 @@
 
 .photos--multinew
   %h3 Add Photos
+  .errors
   %ul{ :id => 'photos', :class => 'thumbnails' }
   %input{ :id => 'fileupload', :type => 'file', :name => 'photo[photo]', 'data-url' => gallery_multiadd_path( gallery.id ), :multiple => '' }

data/lib/tasks/office_tasks.rake

@@ -47,7 +47,7 @@ namespace :office do
   task :email_worker => :environment do
     while true do
 
-      ctxs = ::Ish::EmailContext.current.unsent
+      ctxs = ::Ish::EmailContext.scheduled.unsent
       puts! ctxs.count, 'ctxs'
       ctxs.map do |ctx|
         IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.381
+  version: 0.1.8.383
 platform: ruby
 authors:
 - piousbox