caboose-cms 0.6.29 → 0.6.30

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDkzZmIxYTIzNzgzMDkyMzJhMjM2MTNkZGVmYTcwYTcyMzg5MGVkNg==
+    ODMwZTNmNjZmMWZhNzdmZjBhOTNhZTQwMDk0OTEzOTI0MGVhOTMzYg==
   data.tar.gz: !binary |-
-    ZjUxOWNkYjZjNDJlNTU3OGE5N2ZhYTM3Y2JjZTFkNmU1MzNiNTMzNg==
+    N2Y2MGU4ODljYzNhMmFjMjNiZDk2ODcwOTg4ODI0NmRiOGYxNGI3Yg==
 SHA512:
   metadata.gz: !binary |-
-    YTY4NDc0MDEzNzNiNmU1ZDgwMmNhYjViZmZkMzIwMjk4YmMxYmQyM2RmZGFl
-    NzVmM2FhNGU3ZjU2NTQzY2ZhNTQ4YWZkODRmZDBhMWMxYTAwOTYzOWQxOTU3
-    ZmZhNTY1N2I1NzZmZWQzZjgzOWRjNmJiZWVmZDNmZTIwYjdlZDI=
+    NmI5NDc3NDIxZTdhODkzMzNjMTIzMDMxZTYwMzY3M2Q2NTVmYWQ5Nzc3N2M2
+    YTk4M2QzZDNjOWEwZmNiYTFlYTcyNGM4MDk5ZmFjMjUxZjRhOTA1NjkwNDRl
+    YmE2NjI4ZTZhZWVkYTQwMjM2OWM3NDY2Y2ExOTBiNThjNWY5OTA=
   data.tar.gz: !binary |-
-    ZTE5NjIzN2RiNTk3ZDBmMjliNzUxZTYxZmQ0ZDY2MjJiZDNlZmYyMjM5NDVj
-    ZDU3NWYyZGY4MThiNjBhYWQxMGQyN2ViYTIxNzRmN2IxNGIxZjU3ZmY2Y2Ey
-    NGQzOGUwOWUzYzlhOTJkOWRlMmE0M2IxMmNhN2ZlMTEzN2QzOTM=
+    MzAzZjIzMDgzZDBmM2I3OWU3MGY5YzIyMTQ0NTMzODFhMWJiNDZiYmNiM2Ex
+    YjY5YTBjMWZiYjU3OGQ5M2UxMzEwYmRiY2RiZDUyZjgxMGNmM2YzNmVmNDZm
+    MjA5OTM4MjZmOGJiODVjMmJlNjZhY2U0NGNkMTYxMzc5Y2I0NjU=

data/app/assets/javascripts/caboose/admin_main.js

@@ -11,3 +11,11 @@ function curr(x)
   console.log(t);
   return 'STAHP'
 }
+
+function add_to_crumbtrail(href, text)
+{
+  var c = $('#crumbtrail');
+  if (!c.is(':empty'))
+    c.append(' > ');
+  c.append($('<a/>').attr('href', href).html(text));
+}

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

@@ -99,17 +99,27 @@ IndexTable.prototype = {
     options: { page: 1 }, 
     params: {}
   },
+
+  add_to_url: function(url, str)
+  {
+    if (url.indexOf('?') > -1)
+    {
+      bu = url.split('?');
+      return bu.shift() + str + '?' + bu.join('?');
+    }
+    return url + str;
+  },
   
   // Constructor
   init: function(params) {
     for (var thing in params)
       this[thing] = params[thing];    
         
-    var that = this;
-    if (!this.refresh_url          ) this.refresh_url           = this.base_url + '/json';
-    if (!this.bulk_update_url      ) this.bulk_update_url       = this.base_url + '/bulk';    
-    if (!this.bulk_delete_url      ) this.bulk_delete_url       = this.base_url + '/bulk';
-    if (!this.add_url              ) this.add_url               = this.base_url;
+    var that = this;        
+    if (!this.refresh_url          ) this.refresh_url     = this.add_to_url(this.base_url, '/json');
+    if (!this.bulk_update_url      ) this.bulk_update_url = this.add_to_url(this.base_url, '/bulk');   
+    if (!this.bulk_delete_url      ) this.bulk_delete_url = this.add_to_url(this.base_url, '/bulk');
+    if (!this.add_url              ) this.add_url = this.base_url;
          
     $.each(this.fields, function(i, f) {
       if (f.editable == null) f.editable = true;
@@ -821,7 +831,10 @@ IndexTable.prototype = {
     var form = $('<form/>').attr('id', 'new_form')
       .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(that.form_authenticity_token));
     $.each(this.new_model_fields, function(i, f) {
-      form.append($('<p/>').append($('<input/>').attr('type', 'text').attr('name', f.name).attr('placeholder', f.nice_name).css('width', '' + f.width + 'px')));
+      if (f.type == 'hidden')
+        form.append($('<input/>').attr('type', 'hidden').attr('name', f.name).val(f.value));
+      else
+        form.append($('<p/>').append($('<input/>').attr('type', 'text').attr('name', f.name).attr('placeholder', f.nice_name).css('width', '' + f.width + 'px')));
     });
     form.append($('<div/>').attr('id', that.container + '_new_message'));
     form.append($('<p>')        

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

@@ -22,7 +22,7 @@ Model.prototype = {
   
   save: function(attrib, after) {
     if (!attrib.update_url)
-      attrib.update_url = this.update_url;
+      attrib.update_url = this.update_url;    
     attrib.save(after);        
   },
   

data/app/assets/stylesheets/caboose/admin_main.css

@@ -379,6 +379,48 @@ Page Bar Generator
 #search_form input[type='submit'] { height: 35px; padding: 0 12px; }
 
 
+/******************************************************************************/
+
+#htabs_container {  
+  width: 100%;
+}
+#htabs { 
+  width: 100%;        
+  list-style: none; 
+  margin: 0 0 0 -30px; 
+  padding: 0;
+  border-top: #ccc 0px solid;
+}
+#htabs li { 
+  display: inline-block;
+  list-style: none; 
+  margin: 0; 
+  padding: 0;    
+  text-align: center;
+} 
+#htabs a {
+  display: block;
+  margin: 0;
+  padding: 16px 12px 12px 12px;
+  text-decoration: none;
+  background: #efefef;
+  border-bottom: #ccc 1px solid;  
+  color: #000;
+}
+#htabs a:hover {
+  background: #666;
+  color: #fff;  
+}
+#htabs li.selected a {
+  background: transparent;
+  color: #000;
+  font-weight: bold;  
+  border-bottom: #fff 1px solid;
+}
+#htabs_content {
+  clear: left;  
+}
+
 /******************************************************************************/
 
 #tabs { 

data/app/controllers/caboose/orders_controller.rb

@@ -29,7 +29,7 @@ module Caboose
       })
       
       @orders    = @pager.items
-      @customers = Caboose::User.reorder('last_name, first_name').all
+      @customers = Caboose::User.where(:site_id => @site.id).reorder('last_name, first_name').all
       
       render :layout => 'caboose/admin'
     end

data/app/models/caboose/comment_routes.rb

@@ -0,0 +1,76 @@
+module Caboose
+  class CommentRoutes
+  
+    def CommentRoutes.parse_controllers    
+    
+      classes = []        
+      files = Dir.glob(Rails.root.join('app', 'controllers','*.rb'))
+      for file in files    
+        f = Rails.root.join('app', 'controllers', file)
+        f2 = File.open(f, "r")
+        
+        class_name = nil
+        class_priority = 20
+        route_priority = 20
+        uris = []
+        actions = []
+        f2.each_line do |line|      
+          line = line.strip        
+          if line =~ /^(.*?)class (.*?)Controller(.*?)$/
+            class_name = line.gsub(/^(.*?)class (.*?)Controller(.*?)$/, '\2').gsub(/([A-Z])/, '_\1').downcase
+            class_name[0] = '' if class_name[0] == '_'
+            next
+          end
+          if line =~ /# CLASS PRIORITY: \d/
+            class_priority = line.gsub(/# ROUTES PRIORITY: (\d*?)$/, '\1').to_i            
+            next
+          end
+          if line =~ /# ROUTE PRIORITY: \d/
+            route_priority = line.gsub(/# ROUTE PRIORITY: (\d*?)$/, '\1').to_i            
+            next
+          end          
+          if line.starts_with?('def ')
+            actions << [line.gsub('def ', ''), uris, route_priority]              
+            uris = []
+            route_priority = 20
+          end          
+          if    line =~ /# GET (.*?)/       then uris << "get    \"#{line.gsub(/# GET (.*?)/       , '\1')}\""          
+          elsif line =~ /# POST (.*?)/      then uris << "post   \"#{line.gsub(/# POST (.*?)/      , '\1')}\""          
+          elsif line =~ /# PUT (.*?)/       then uris << "put    \"#{line.gsub(/# PUT (.*?)/       , '\1')}\""          
+          elsif line =~ /# DELETE (.*?)/    then uris << "delete \"#{line.gsub(/# DELETE (.*?)/    , '\1')}\""
+          end
+        end      
+        classes << [class_name, actions, class_priority]
+      end
+      puts "--------------------------------------------------------------------"
+      routes = []
+      classes.sort_by{ |arr| arr[2] }.each do |carr|
+        
+        class_name = carr[0]
+        actions = carr[1]
+        
+        # Get the longest URI so we can make routes that line up vertically
+        longest = ''
+        actions.each do |action, uris|          
+          uris.each do |uri|
+            longest = uri if uri.length > longest.length
+          end
+        end
+        length = longest.length + 1
+        
+        # Make the route line
+        actions.sort_by{ |arr| arr[2] }.each do |arr|
+          action = arr[0]
+          uris = arr[1]
+          uris.each do |uri|
+            puts "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\""
+            routes << "#{uri.ljust(length, ' ')} => \"#{class_name}\##{action}\"" 
+          end
+        end
+        puts ""
+      end      
+      return routes      
+    end
+    
+  end
+end

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

@@ -15,7 +15,9 @@
       <optgroup label='Status' style='width: 100px'>
         <option value=''>-- All customers --</option>        
         <% @customers.each do |c| %>
-          <option value='<%= c.id %>'<%= @pager.params['customer_id'] == c.id ? " selected='true'" : '' %>><%= "#{c.last_name}, #{c.first_name}" %></option>
+          <option value='<%= c.id %>'<%= @pager.params['customer_id'] == c.id ? " selected='true'" : '' %>>
+            <%= c.first_name.blank? && c.last_name.blank? ? c.username : "#{c.last_name}, #{c.first_name}" %>
+          </option>
         <% end %>
       </optgroup>
     </select></p>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.29'
+  VERSION = '0.6.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.29
+  version: 0.6.30
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -696,6 +696,7 @@ files:
 - app/models/caboose/calendar_event_group.rb
 - app/models/caboose/category.rb
 - app/models/caboose/category_membership.rb
+- app/models/caboose/comment_routes.rb
 - app/models/caboose/core_plugin.rb
 - app/models/caboose/crumbtrail.rb
 - app/models/caboose/customization_membership.rb