caboose-cms 0.6.31 → 0.6.32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmE5Nzc5MGY3NWFjYTViZGZkMDc5NTkzMGU0MDQ3NjRmNjdmOGM0NQ==
+    N2JlODk5YTY0MzRkMzVmNjJjOWU5ZTkxYjVhZGQyY2RiMDA2OTI5Mw==
   data.tar.gz: !binary |-
-    NzY2NTE4NmQ5MzE2ZWY4OGU2MzI0ZWVkNGUzZjNlYjA5YWVmNjA5Yg==
+    ZGYxMTViOWU5NmVlN2NhNDllMTgwNDU0MjhiMzdmNzdhODc4YzIwOA==
 SHA512:
   metadata.gz: !binary |-
-    YjY0MWY1MDQwMzE4MmRhMDAzMmViZDFhYmNjYjJhNThjODk1ZjYwOTc3NDZm
-    ODM3MWFlNjQzOGUzMTg5YmQ4YTgyN2I4ZDY0ZmUwNzgxMzg1ZjBiMWMzYWM1
-    MjlhYTdkY2ZiOWViYjE5NTJjYmRiY2UwM2ZkZDc3ZDMyMTRkOGQ=
+    NTIzMWU2ZDFkNTU0ZGI2YjlmZDU3NmUwMmRmMDUyZDMyYzVlODc2OWYwYTE0
+    ZDU0MDRiZDBjYzBiMDI0YzY1NjE4MDhiYWUyYWU3M2U5ZWQzOWZiYWNlZWZj
+    NjBhMjdhOGM1OGJhZGVlZmRhNmE5OWMxZjZiZWUxZmYxNjI5YjE=
   data.tar.gz: !binary |-
-    YWQ0OWYxNjAwZmY3ZWI2NTIyNmUyYWI5OWExZjVlN2EzOTEzZDhkYWE3NTlh
-    ODFlZWFiZDI5MWZiZTlmZTY3MmRhMGZhN2Y3NGUwZTU5YzAzNjFkMjVmMDNi
-    MGEzYzU2ZDEwMjIwNWU4NGY3Njk3ZTFlMWJlNzcwYzQ5MzAzNjY=
+    OWViMGY4MTQzOGQzMGVhNzU4ZWY0ZGFkMWU1NjI4MjQ2NWIzNDhlNDYwZGE0
+    MDM3ZWI3MmU0NjRjZTZiM2IyOGU4Y2RkYTk0ZDc5YWM5OTczNjNkYTRiNjU5
+    MDZhYmFkNWVlNDI3YWMyZDY0Y2UxZTU0OWE3ZGU3NGE5NjUzNzY=

data/app/assets/javascripts/caboose/model/index_table.js

@@ -832,13 +832,37 @@ IndexTable.prototype = {
   
   new_form: function()
   {
-    var that = this;          
+    var that = this;
+    
+    $.each(this.new_model_fields, function(i, f) {
+      if (f.options_url && !f.options)
+      {
+        $.ajax({
+          url: f.options_url,
+          type: 'get',
+          success: function(resp) { f.options = resp },
+          async: false          
+        });
+      }
+    });        
+    
     var form = $('<form/>').attr('id', 'new_form')
       .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(that.form_authenticity_token));
     var focus_field = false;
     $.each(this.new_model_fields, function(i, f) {
       if (f.type == 'hidden')
         form.append($('<input/>').attr('type', 'hidden').attr('name', f.name).val(f.value));
+      else if (f.type == 'select')
+      {       
+        var select = $('<select/>').attr('name', f.name);
+        $.each(f.options, function(i, option) {
+          var opt = $('<option/>').val(option.value).html(option.text);
+          if (f.value && f.value == option.value)
+            opt.attr('selected', 'true');
+          select.append(opt);
+        });
+        form.append(select);
+      }
       else
       {
         form.append($('<p/>').append($('<input/>').attr('type', 'text').attr('name', f.name).attr('placeholder', f.nice_name).css('width', '' + f.width + 'px')));

data/app/controllers/caboose/login_controller.rb

@@ -38,9 +38,9 @@ module Caboose
           else
             remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")            
             login_user(login_resp.user, remember)            
-            resp.redirect = return_url
-            resp.modal = false
-            Caboose.plugin_hook('login_success', login_resp.user.id)            
+            #resp.redirect = return_url
+            resp.redirect = Caboose.plugin_hook('login_success', return_url, login_resp.user)
+            resp.modal = false                        
           end
         end
       end

data/app/controllers/caboose/orders_controller.rb

@@ -55,8 +55,12 @@ module Caboose
     # GET /admin/orders/:id
     def admin_edit
       return if !user_is_allowed('orders', 'edit')
-      @order = Order.find(params[:id])
-      #@order.calculate
+      @order = Order.where(:id => params[:id]).first
+
+      if params[:id].nil? || @order.nil?
+        render :file => 'caboose/orders/admin_invalid_order', :layout => 'caboose/admin'
+        return
+      end            
       render :layout => 'caboose/admin'
     end
     

data/app/models/caboose/caboose_plugin.rb

@@ -12,4 +12,8 @@ class Caboose::CaboosePlugin
     return nav
   end
   
+  def self.login_success(return_url, user_id)    
+    return return_url
+  end
+  
 end

data/app/views/caboose/orders/admin_invalid_order.html.erb

@@ -0,0 +1,3 @@
+
+<h1>Invalid Order Number</h1>
+<p><input type='button' value='< Back' onclick="window.location='/admin/orders';" /></p>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.31'
+  VERSION = '0.6.32'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.6.32
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -914,6 +914,7 @@ files:
 - app/views/caboose/orders/admin_delete_form.html.erb
 - app/views/caboose/orders/admin_edit.html.erb
 - app/views/caboose/orders/admin_index.html.erb
+- app/views/caboose/orders/admin_invalid_order.html.erb
 - app/views/caboose/orders/admin_new.html.erb
 - app/views/caboose/orders/admin_print.html.erb
 - app/views/caboose/orders/admin_summary_report.html.erb