caboose-cms 0.5.116 → 0.5.117

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzE5ZTQzY2FhZGM1NjEzMjZlZDRmNGYxZmE0YTY3YmI3NTI4MmQwNA==
+    NDk4YzUwNzc5OGRjMzEzYTkzYmNmY2Q1M2FlNTkwMzkzMzJmMTZiZA==
   data.tar.gz: !binary |-
-    Mzk4N2RkMjRkYTVmMDczNjcxNDZkNjFiY2NhMjJmZGJiNTM5ZDI0NQ==
+    ZGNhNmZhMjI4YzcwN2Q2MjUzMTVlOTNiZTVkNzNjZGMyNDdiYzM3YQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjdlOTRhNWQxNTczMTk5OGEyMjk5MDY5MTc1MWE3MTk5MDZhZWI3MzllNmQ2
-    MDFhZGE0M2YyOTRhNDA5NWVlZTY2NWI1NmE0NWVjNzE4YWM5ZjdmZDRmNWQ5
-    NGZjNDI3ZDEyOTQyNTg1ODE2Y2I0NTg0Y2RhMmYzODE4YTE3YTM=
+    MDQ2Mzk3MTQ3NTBkZWNlMTY1YzZlNGJlZjM4NTJhMjk5MTcwYjI5MTU2OGE1
+    NzU4Y2ZlNzk5MDQ5NzY2NzQ0Yjg1MTcyNGM2MjE1MmE1MDk1Yzc0NDQ3OGFk
+    ZjUzMjkxZTQ1NDMyMzI2MDQ4NTg2MzFlN2JlODc2NjQ4MmU3ZWM=
   data.tar.gz: !binary |-
-    ZTI3YjA0M2Y4Mzc0NDBiODU2NWVmN2Y5YjgyMGQwMjI5N2RiM2MwNjQ2ODhl
-    OGI2NzAwNmZhMzdhZjIyZTAwZjJjMzFjNTdhNTU5NmFlNWQzNzI5NGNkM2Q4
-    Zjg0ZTU2NzE4NjEzYTBhN2FiNzgzMjI1MjMzZjZmYzBhMzEzNzA=
+    YzkxOGFjZDc3ZDUyZjVjMWZkOTdkMGZhMTRiMDQwOGM3MzI0Nzc0NWRiMmI4
+    NjA0NGJkNmMzYTE2M2ZlZGQ0ZjgxZDA0ZmI3MWU2Y2UzZmJiMTlkY2Q2NjE1
+    NGE1ZDBhOGFlZDI2ZDBjYTQ5YmUwMzI4ZTYyYzU0YjU2ZjZkNWY=

data/app/controllers/caboose/#vendors_controller.rb#

@@ -0,0 +1,114 @@
+module Caboose
+  class VendorsController < Caboose::ApplicationController
+        
+    # GET /admin/vendors
+    def admin_index
+      return if !user_is_allowed('vendors', 'view')
+      
+      @pager = Caboose::Pager.new(params, {
+        'site_id'   => @site.id,
+        'name_like' => ''
+      }, {
+        'model'          => 'Caboose::Vendor',
+        'sort'           => 'name',
+        'desc'           => false,
+        'base_url'       => '/admin/vendors',
+        'items_per_page' => 25,
+        'use_url_params' => false
+      });
+      
+      @vendors = @pager.items
+      
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/vendors/:id
+    def admin_edit
+      return if !user_is_allowed('vendors', 'edit')
+      @vendor = Vendor.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # PUT /admin/vendors/:id/update
+    def admin_update
+      return if !user_is_allowed('vendors', 'edit')
+      vendor = Vendor.find(params[:id])
+      
+      params.each do |name, value|
+        case name
+          when 'site_id'  then vendor.site_id  = value
+          when 'name'     then vendor.name     = value
+          when 'status'   then vendor.status   = value
+          when 'featured' then vendor.featured = value
+        end
+      end
+      
+      render :json => { :success => vendor.save }
+    end
+    
+    # POST /admin/vendors/:id/update/image
+    def admin_update_image
+      return if !user_is_allowed('vendors', 'edit')
+      
+      vendor = Vendor.find(params[:id])       
+      vendor.image = params[:image]
+      vendor.save
+      
+      resp = StdClass.new
+      resp.attributes = { :image => { :value => vendor.image.url(:thumb) }}
+      resp.success = vendor.save            
+    end
+    
+    # GET /admin/vendors/new
+    def admin_new
+      return if !user_is_allowed('vendors', 'add')
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/vendors
+    def admin_add
+      return if !user_is_allowed('vendors', 'add')
+      
+      render :json => { :success => false, :message => 'Must define a name' } and return if params[:name].nil? || params[:name].empty?
+      
+      vendor = Vendor.new(
+        :site_id => @site.id,
+        :name    => params[:name],
+        :status  => 'Active'
+      )      
+      render :json => { :success => vendor.save, :redirect => "/admin/vendors/#{vendor.id}" }
+    end
+    
+    # DELETE /admin/vendors/:id
+    def admin_delete      
+      return if !user_is_allowed('vendors', 'delete')
+      v = Vendor.find(params[:id])
+      v.destroy
+      
+      resp = StdClass.new({
+        'redirect' => '/admin/vendors'
+      })
+      render :json => resp
+    end
+    
+    # GET /admin/vendors/options
+    def options      
+      render :json => Vendor.where(:site_id => @site.id).reorder(:name).all.collect
+        { :text => 'Active'   , :value => 'Active'   },
+        { :text => 'Inactive' , :value => 'Inactive' },
+        { :text => 'Deleted'  , :value => 'Deleted'  }
+      ]      
+    end
+    
+    # GET /admin/vendors/status-options
+    def status_options      
+      render :json => [
+        { :text => 'Active'   , :value => 'Active'   },
+        { :text => 'Inactive' , :value => 'Inactive' },
+        { :text => 'Deleted'  , :value => 'Deleted'  }
+      ]      
+    end    
+    
+  end
+end
+

data/app/views/caboose/products/admin_edit_general.html.erb

@@ -3,30 +3,7 @@ p = @product
 %>
 <%= render :partial => 'caboose/products/admin_header' %>
 
-<p>
-  <strong>Vendor:</strong>
-  
-  <select id="vendor" data-product-id="<%= @product.id %>">
-    <option>-- Select a Vendor --</option>
-    
-    <% Caboose::Vendor.where(:site_id => @site.id).reorder(:name).all.each do |vendor| %>
-      <option value="<%= vendor.id %>" <%= 'selected' if p.vendor_id && p.vendor_id == vendor.id %>><%= vendor.name %></option>
-    <% end %>
-  </select>
-</p>
-
-
-<% if p.vendor %>
-	<p>
-		<strong>Vendor Status (<%= p.vendor.name %>):</strong>
-		<select id="vendor-status" data-vendor-id="<%= p.vendor.id %>">
-			<% ['Active', 'Inactive'].each do |status| %>
-				<option value="<%= status %>" <%= 'selected' if p.vendor.status == status %>><%= status %></option>
-			<% end %>
-		</select>
-	</p>
-<% end %>
-
+<p><div id='product_<%= p.id %>_vendor_id'></div></p>
 <p><div id='product_<%= p.id %>_title'></div></p>
 <p><div id='product_<%= p.id %>_caption'></div></p>
 <p><div id='product_<%= p.id %>_handle'></div></p>
@@ -47,34 +24,6 @@ p = @product
 date_available = p.date_available ? p.date_available.strftime('%F') : ''
 %>
 $(document).ready(function() {
-  $('#vendor').on('change', function(event) {
-    event.preventDefault();
-    
-    var $target    = $(event.target)
-      , vendor_id  = $target.val()
-      , product_id = $target.data('product-id');
-    
-    console.log(vendor_id, product_id);
-    
-    $.ajax({
-      type: 'put',
-      url: '/admin/products/' + product_id + '/update-vendor',
-      data: { vendor_id: vendor_id },
-      success: function(response) {
-        console.log(response);
-      }
-    })
-  });
-  
-	$('#vendor-status').on('change', function(e) {
-		$select = $(e.target)
-		
-		$.ajax({
-			type: 'put',
-			url: '/admin/products/update-vendor-status/' + $select.data('vendor-id'),
-			data: { status: $select.val() }
-		});
-	});
 	
   m = new ModelBinder({
     name: 'Product',
@@ -82,9 +31,10 @@ $(document).ready(function() {
     update_url: '/admin/products/<%= p.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
+      { name: 'vendor_id'       , nice_name: 'Vendor'               , type: 'text'      , value: <%= raw Caboose.json(p.vendor_id       ) %>, width: 500, options_url: '/admin/vendors/options' },
       { name: 'title'           , nice_name: 'Title'                , type: 'text'      , value: <%= raw Caboose.json(p.title           ) %>, width: 500 },
       { name: 'caption'         , nice_name: 'Caption'              , type: 'text'      , value: <%= raw Caboose.json(p.caption         ) %>, width: 500 },
-      { name: 'status'          , nice_name: 'Status'               , type: 'select'    , value: <%= raw Caboose.json(p.status          ) %>, width: 500, text: <%= raw Caboose.json(p.status) %>, options_url: '/admin/products/status-options' },
+      { name: 'status'          , nice_name: 'Status'               , type: 'select'    , value: <%= raw Caboose.json(p.status          ) %>, width: 500, options_url: '/admin/products/status-options' },
       { name: 'handle'          , nice_name: 'URL Handle'           , type: 'text'      , value: <%= raw Caboose.json(p.handle          ) %>, width: 500 },
       { name: 'seo_title'       , nice_name: 'SEO Page Title'       , type: 'text'      , value: <%= raw Caboose.json(p.seo_title       ) %>, width: 500 },
       { name: 'seo_description' , nice_name: 'SEO Meta Description' , type: 'textarea'  , value: <%= raw Caboose.json(p.seo_description ) %>, width: 500, height: 150 },

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.116'
+  VERSION = '0.5.117'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.116
+  version: 0.5.117
 platform: ruby
 authors:
 - William Barry
@@ -489,6 +489,7 @@ files:
 - app/assets/templates/caboose/product/images.jst.ejs
 - app/assets/templates/caboose/product/images_old.jst.ejs
 - app/assets/templates/caboose/product/options.jst.ejs
+- app/controllers/caboose/#vendors_controller.rb#
 - app/controllers/caboose/ab_options_controller.rb
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb