tb_core 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7071129edfa67883164c13d28337400840d8977b
-  data.tar.gz: aee125137d5a1b6c5bd033480eccbf555fddf2fa
+  metadata.gz: 1f0cffee46e753563727811398cd307e5263df61
+  data.tar.gz: a47903d588cfae9ddea08cbe0a844685b7a9578f
 SHA512:
-  metadata.gz: 474dd7c6e09fd2a1228387c2281a2156658b52b3eb3a05f634827cfa1f8d5efeda720dd0ccffa1306293ec87dea42567239ccde4ed5d0157f67431792bfa40fc
-  data.tar.gz: d6ed5438c32dc90b131dc4bf6f907a0dac1de00fc17a48d01e043578b7f873263731e647ccf2526f55a18950f41e8022e3868c72a44bd4abbb6dda285cbe895f
+  metadata.gz: c5e33f9dc1dea1dc14efae2017bce65b7168cab6a1b9a6c5d082898fce58a2eb134ee88a811414ce360a3e5c5ad676be29ef942d22b2d7110c204ab0f3b5b229
+  data.tar.gz: 3ccb89456ef9606374f775aaeadffb943ea144e0167d02b6243ce1eb2b17bb2f87363dac20d34272c03ce4b31ca8ef558f3c18f38b810156facf562aa8b08a33

data/app/assets/javascripts/tb_core/remote.js

@@ -33,7 +33,7 @@ tb.remote = {
 var onRemoteFormBefore = function(event){
   var $form = $(this);
   if($form.data('type') === undefined){
-    $form.data('type', 'json');  
+    $form.data('type', 'json');
   }
 };
 
@@ -91,7 +91,7 @@ var buildSuccessPath = function(path, json){
 *
 * ie:
 * <form action="..." data-remote="true" data-errors="inline">
-*   - OR - 
+*   - OR -
 * <form action="..." data-remote="true" data-errors="alert">
 */
 var onRemoteFormErrors = function(event, jqXHR, textStatus, errorThrown){
@@ -99,7 +99,7 @@ var onRemoteFormErrors = function(event, jqXHR, textStatus, errorThrown){
   var errorType = $form.data('errors');
   if(jqXHR.status == 422){
     if(errorType == 'inline'){
-      displayErrorsInline($form, jqXHR.responseJSON.errors);
+      displayErrorsInline($form, jqXHR.responseJSON);
     }
     else{
       displayErrorsAlert(jqXHR.responseJSON);
@@ -119,9 +119,10 @@ var onRemoteFormErrors = function(event, jqXHR, textStatus, errorThrown){
 var displayErrorsInline = function($form, errors){
   $form.find('.form-error-inline, .form-error-base').remove();
   for(var key in errors){
+    var messages = errors[key].messages;
     if(key == 'base'){
-      for(var i=0; i<errors[key].length; i++){
-        $form.prepend('<p class="form-error form-error-base">'+errors[key][i]+'</p>');
+      for(var i=0; i<messages.length; i++){
+        $form.prepend('<p class="form-error form-error-base">'+messages[i]+'</p>');
       }
     }
     else{
@@ -134,20 +135,21 @@ var displayErrorsInline = function($form, errors){
         $input = $form.find("[name$='[" + keyArr.join('][') + "]']");
       }
       else{
-        $input = $form.find("[name$='[" + key + "]']");
-
+        $input = $form.find("[name$='[" + key + "]']").filter(function(index, input){
+          return !input.name.match(/\]\[/); // Filter out nested attribute inputs ie model[a][b]
+        })
         if($input.length === 0 && !key.match(/_id$/)){
           $input = $form.find("[name$='[" + key + "_id]']");
         }
       }
 
+      var message = messages[0];
       if($input.length > 0){
-        var message = errors[key][0];
         $input.parent().append('<p class="form-error form-error-inline">'+message+'</p>');
       }
       else{
         console.warn('Missing input field for key:', key);
-        $form.prepend('<p class="form-error form-error-base">'+key+' '+errors[key][0]+'</p>');
+        $form.prepend('<p class="form-error form-error-base">'+key+' '+message+'</p>');
       }
     }
   }
@@ -156,7 +158,7 @@ var displayErrorsInline = function($form, errors){
     if(!tb.util.elementIsInView($firstError)){
       $('body, html').animate({
         scrollTop: $firstError.offset().top
-      });  
+      });
     }
   }
 };
@@ -164,14 +166,19 @@ var displayErrorsInline = function($form, errors){
 /*
 * Display errors in a standard window.alert dialog
 */
-var displayErrorsAlert = function(json){
+var displayErrorsAlert = function(errors){
   var text = "Please correct the following errors:\n";
   var label, message;
   var index = 0;
-  for(var key in json.errors){
-    label = json.labels[index];
-    message = json.errors[key][0];
-    text += " - " + label + ' ' + message + "\n";
+  for(var key in errors){
+    label = errors[key].label;
+    message = errors[key].messages[0];
+    if(key == 'base'){
+      text += ' - ' + message + "\n"
+    }
+    else{
+      text += ' - ' + label + ' ' + message + "\n"
+    }
     index++;
   }
   window.alert(text);
@@ -191,7 +198,7 @@ var onRemoteDeleteTableRow = function(){
 /*
 * Attach an authenticity_token input field when a remote form aborts due to a file input field
 *
-* When a form is configured with remote:true, the authenticity_token hidden input you would normally see is not included. Then what 
+* When a form is configured with remote:true, the authenticity_token hidden input you would normally see is not included. Then what
 * can happen is the form can fall back to a non-remote action for some reason, possibly due to the presence of a file input field. The
 * net result is that the server responds with a "Can't verify CSRF token authenticity" error because none was sent.
 *
@@ -214,7 +221,7 @@ var onRemoteAbortedFile = function(event, inputs){
 
 /*
 * Monkeypatch the base $.rails.enableFormElement function to add a
-* delay and a success text value to the button before returning to 
+* delay and a success text value to the button before returning to
 * default state.
 */
 var extendEnableFormElementMethod = function(){
@@ -232,7 +239,7 @@ var extendEnableFormElementMethod = function(){
       }, 1000);
     }
     else{
-      originalEnableFormElement(element); 
+      originalEnableFormElement(element);
     }
   };
 };

data/app/controllers/user_sessions_controller.rb

@@ -1,16 +1,16 @@
-  class UserSessionsController < ApplicationController
+class UserSessionsController < ApplicationController
 
   skip_before_action :require_user, :only => [:new, :create, :destroy]
   skip_before_action :check_requires_password_change, :only => [:destroy, :change_password, :set_change_password]
 
   respond_to :html, :json, :js
   layout 'user_sessions'
-  
+
   def new
     @user_session = SpudUserSession.new
     render 'new'
   end
-  
+
   def create
     @user_session = SpudUserSession.new(params[:spud_user_session])
     if @user_session.save()
@@ -31,7 +31,7 @@
       end
     end
   end
-  
+
   def destroy
     current_user_session.destroy unless current_user_session.blank?
     respond_with({}) do |format|
@@ -43,6 +43,7 @@
   end
 
   def change_password
+    require_user
     render 'change_password'
   end
 

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.9"
+    VERSION = "1.3.10"
   end
 end

data/lib/tb_core/responder.rb

@@ -26,10 +26,12 @@ class TbCore::Responder < ActionController::Responder
   # This override also sends the translated labels for convenience
   #
   def json_resource_errors
-    return {
-      :errors => resource.errors,
-      :labels => resource.errors.keys.collect{ |attribute| resource.class.human_attribute_name(attribute) }
-    }
+    return Hash[resource.errors.messages.map do |attribute, messages|
+      [attribute, {
+        label: resource.class.human_attribute_name(attribute),
+        messages: messages
+      }]
+    end]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails