tb_core 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10dce243e38a7dda2ea1667da4ef47454d6c07c7
-  data.tar.gz: 21119a1481d42568af16b0afac0772b613b3eced
+  metadata.gz: 6a641b08c309d6355240a0cb59dec84b96552572
+  data.tar.gz: 96c0a3a67b8df216c83c695bddc5111f0239ece1
 SHA512:
-  metadata.gz: 52a4a4a753ce259fc37b70763755d83b886b366f77700f5ffbe479cb2ae91cba6b85ce02a77d3af4f4eec2dd45b1e25c037cc6c6161b5d486caffceb460b3ae6
-  data.tar.gz: 189b24c1e07af8ecd989bd9420e62d72976858ecb58274b5ff4db4f618a2bce452e1f5b34805df4f694613b35d15f269846c805ad884390d1c323c86565c2532
+  metadata.gz: 7eacaae333704ced506a7d920ac533c818460237cbf60f06698bf993e142c5d59e0d85d7478da2e470e2ceee7ca7b20a3ac3a2039865530cbcfca72a32dfdd9d
+  data.tar.gz: c5de32f69349861b4672df836ecbe24179f33c1c1cf55d968fac1171c3c6ff4728899c23b7ee372d73e4b2738038299e1a3412c081ac61831b713ee7575847cf

data/app/controllers/admin/user_sessions_controller.rb

@@ -24,7 +24,7 @@ class Admin::UserSessionsController < Admin::ApplicationController
   end
   
   def destroy
-    current_user_session.destroy
+    current_user_session.destroy unless current_user_session.blank?
     flash[:notice] = "Logout successful!"
     redirect_to admin_login_path
   end

data/app/helpers/twice_baked/application_helper.rb

@@ -1,11 +1,16 @@
 module TwiceBaked::ApplicationHelper
 
-  def tb_form_errors(record)
+  def tb_form_errors(record, *fields_to_display)
     if record.errors.any?
       content_tag :div, :class => 'form-errors' do
         concat(tb_form_error_header(record))
         concat(raw "<ul>")
-        concat(raw record.errors.full_messages.collect{ |msg| "<li>#{msg}</li>" }.join())
+        if fields_to_display.any?
+          messages = fields_to_display.collect{ |field| record.errors.full_messages_for(field) }.flatten()
+        else
+          messages = record.errors.full_messages
+        end
+        concat(raw messages.collect{ |msg| "<li>#{msg}</li>" }.join())
         concat(raw "</ul>")
       end
     end

data/app/views/admin/users/index.html.erb

@@ -23,7 +23,7 @@
               <td class="table-actions">
                 <%= link_to 'Details', admin_user_path(spud_user), :class => 'btn btn-default btn-sm' %>
                 <%= link_to 'Edit', edit_admin_user_path(spud_user), :class => 'btn btn-default btn-sm' %>
-                <%= link_to 'Delete', admin_user_path(spud_user), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this Comic book?'}, :class => 'btn btn-danger btn-sm' %>
+                <%= link_to 'Delete', admin_user_path(spud_user), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this user?'}, :class => 'btn btn-danger btn-sm' %>
               </td>
             </tr>
           <% end %>

data/lib/generators/spud/templates/views/admin/_form.html.erb

@@ -1,6 +1,6 @@
 <%%= form_for [:admin, @<%=module_name_formatted.singularize%>], :builder => TbCore::FormBuilder, :html => {:class => 'form-horizontal'} do |f| %>
   
-  <%%= tb_form_error_header(f.object) %>
+  <%%= tb_form_errors(f.object, :base) %>
   <%- attributes.collect{ |att| att.split(':') }.each do |arg_0, arg_1| %>
   <%= field_for_attribute(arg_1, arg_0) %>
   <%- end %>

data/lib/spud_core/configuration.rb

@@ -17,6 +17,21 @@ module Spud
     self.production_alert_domain = nil
     self.use_email_as_login = false
 
+    def self.site_config_for_host(host)
+      ActiveSupport::Deprecation.warn 'Spud::Core.site_config_for_host is deprecated and will be removed in the future'
+      return default_site_config
+    end
+
+    def self.site_config_for_id(id)
+      ActiveSupport::Deprecation.warn 'Spud::Core.site_config_for_id is deprecated and will be removed in the future'
+      return default_site_config
+    end
+
+    def self.default_site_config
+      ActiveSupport::Deprecation.warn 'Spud::Core.default_site_config is deprecated and will be removed in the future'
+      return {:site_id => Spud::Core.config.site_id, :site_name => Spud::Core.config.site_name, :short_name => Spud::Core.config.short_name}
+    end
+
     def self.append_admin_javascripts(*args)
       if args[0].class == Array
         Spud::Core.config.admin_javascripts += args[0]

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails