zutils 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d244d56656907c4b603037d1bbe6a75b2e38d22f15096aacb3b6ec1ec83012a
-  data.tar.gz: 57b3abd0e46f01b9c1ec1bf585a8692a5a94966950950945351af3654aefce3e
+  metadata.gz: bf846e9c312ebccb7cdbaef9c3c176c7e3d1dee47a79f080a95a6fdc8bfc6844
+  data.tar.gz: 99f5a3df431d93b9bc81ed1e7c8a3cd1d6395dffe4045e6716f7401a3a2c8b91
 SHA512:
-  metadata.gz: dbd20eb88e07a7bc2a79c1df628c4d610f367e9ec1511980fd524b11f7f7682014e2ce36e84f79f890866e355ec970aecf39725fb4fce888b1918ac373953a1b
-  data.tar.gz: 78f383553e38ffe2d4763c3e0b4b3c5a50aa8c5c2356430e736903740e0671225980f68e00f64f592885020752d845b3b88bbf1bd7d71c29e16684f4e5848638
+  metadata.gz: 0e0bd646795a8ac367228f3fc598e0a9b60c705b5fae90677d2d268493e45cf28caaed403c6904418d4a40f998e5879d788ff148ca5613f94baa6da2a41dd6f7
+  data.tar.gz: fb0f5bc28a532aebbf58bf4f7f12f354827dcb9b11d4bb6dbd8db9aa4f8c6dcdfbd230d6485d99a9268649eb35f785c71be745b683c987149a42339aecdc7959

data/app/assets/javascripts/zutils.js

@@ -26,6 +26,8 @@ $(document).ready(function () {
 
     $("#new_" + $(item).data('model')).on("submit", function(e) {
       e.preventDefault();
+      $("#new_" + $(item).data('model')).find('.has-error').removeClass('has-error');
+      $("#new_" + $(item).data('model')).find('.help-block').text("");
       $.ajax({
         method: "POST",
         dataType: "json",
@@ -36,6 +38,16 @@ $(document).ready(function () {
           selectizeCallback = null;
 
           $("." + $(item).data('model') + "-modal").modal('toggle');
+        },
+        error: function(response) {
+          $.each(response.responseJSON, function(key, value) {
+            $("#new_" + $(item).data('model')).find("." + $(item).data('model') + '_' + key).addClass('has-error');
+            if (!($("#new_" + $(item).data('model') + " ." + $(item).data('model') + '_' + key).find('.help-block').length)) {
+              $("#new_" + $(item).data('model')).find("." + $(item).data('model') + '_' + key).append("<p class='help-block'></p>");
+            }
+            $("#new_" + $(item).data('model')).find("." + $(item).data('model') + '_' + key).find('.help-block').text(value);
+          });
+          $.rails.enableFormElements($("#new_" + $(item).data('model') + ""));
         }
       });
     });
@@ -44,6 +56,8 @@ $(document).ready(function () {
   $(".selectize_with_add_without_modal").each(function(i, item) {
     $(item).selectize({
       create: function(input, callback) {
+        $(item).parent().removeClass('has-error');
+        $(item).parent().find('.help-block').text("");
         selectizeCallback = callback;
         data = {};
         data[$(item).data('model')] = {};
@@ -55,6 +69,14 @@ $(document).ready(function () {
           data: data,
           success: function(response) {
             selectizeCallback({value: response.id, text: response.name});
+          },
+          error: function(response) {
+            $(item).parent().addClass('has-error');
+            if (!( $(item).parent().find('.help-block').length)) {
+                $(item).parent().append("<p class='help-block'></p>");
+            }
+            $(item).parent().find('.help-block').text("Valor já existente: " + input);
+            selectizeCallback();
           }
         });
         selectizeCallback = callback;

data/app/views/shared/_fields.html.erb

@@ -0,0 +1,31 @@
+<% excluded_columns ||= [] %>
+<% restricted_columns ||= {} %>
+
+<% form_fields ||= (object.class.respond_to?('form_fields') ? object.class.form_fields : {}) %>
+<% form_ordered_fields ||= (form_fields.empty? ? object.class.column_names : form_fields.keys) %>
+
+<div class="row">
+  <% (form_ordered_fields - ['id', 'created_at', 'updated_at', 'deleted_at'] - excluded_columns).each do |column| %>
+    <% wphtml = "col-md-#{(form_fields[column.to_sym].class == Hash ? form_fields[column.to_sym][:size] : form_fields[column.to_sym] ) || 12}" %>
+    <% hint = (form_fields[column.to_sym].class == Hash ? form_fields[column.to_sym][:hint] : '') %>
+    <% placeholder = (form_fields[column.to_sym].class == Hash ? form_fields[column.to_sym][:placeholder] : '') %>
+    <% if object.class.column_for_attribute(column).type == :text %>
+      <%= f.input column, input_html: { rows: 10, cols: 20 }, wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
+    <% elsif [:date, :datetime].include?(object.class.column_for_attribute(column).type) %>
+      <%= f.input column, html5: true, wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
+    <% elsif /_id$/ =~ column && object.respond_to?(column.split('_id')[0]) %>
+      <% if restricted_columns.keys.include?(column.to_sym) %>
+        <%= f.association column.split("_id")[0],
+          label: restricted_columns[column.to_sym][:label],
+          collection: restricted_columns[column.to_sym][:collection],
+          wrapper_html: { class: wphtml },
+          hint: hint, placeholder: placeholder
+        %>
+      <% else %>
+        <%= f.association column.split("_id")[0], wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
+      <% end %>
+    <% else %>
+      <%= f.input column, wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
+    <% end %>
+  <% end %>
+</div>

data/app/views/shared/_form.html.erb

@@ -22,31 +22,7 @@
       </h3>
     </div>
     <div class="box-body">
-      <div class="row">
-        <% (form_ordered_fields - ['id', 'created_at', 'updated_at', 'deleted_at'] - excluded_columns).each do |column| %>
-          <% wphtml = "col-md-#{(form_fields[column.to_sym].class == Hash ? form_fields[column.to_sym][:size] : form_fields[column.to_sym] ) || 12}" %>
-          <% hint = (form_fields[column.to_sym].class == Hash ? form_fields[column.to_sym][:hint] : '') %>
-          <% placeholder = (form_fields[column.to_sym].class == Hash ? form_fields[column.to_sym][:placeholder] : '') %>
-          <% if object.class.column_for_attribute(column).type == :text %>
-            <%= f.input column, input_html: { rows: 10, cols: 20 }, wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
-          <% elsif [:date, :datetime].include?(object.class.column_for_attribute(column).type) %>
-            <%= f.input column, html5: true, wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
-          <% elsif /_id$/ =~ column && object.respond_to?(column.split('_id')[0]) %>
-            <% if restricted_columns.keys.include?(column.to_sym) %>
-              <%= f.association column.split("_id")[0],
-                label: restricted_columns[column.to_sym][:label],
-                collection: restricted_columns[column.to_sym][:collection],
-                wrapper_html: { class: wphtml },
-                hint: hint, placeholder: placeholder
-              %>
-            <% else %>
-              <%= f.association column.split("_id")[0], wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
-            <% end %>
-          <% else %>
-            <%= f.input column, wrapper_html: { class: wphtml }, hint: hint, placeholder: placeholder %>
-          <% end %>
-        <% end %>
-      </div>
+      <%= render 'shared/fields', object: object, f: f, excluded_columns: excluded_columns, restricted_columns: restricted_columns %>
     </div>
     <div class="box-footer">
       <% if back_link %>

data/app/views/shared/_modal.html.erb

@@ -1,14 +1,16 @@
-<div class="modal fade in <%= model.name.underscore %>-modal" id="modal-default">
+<% partial ||= 'shared/fields' %>
+
+<div class="modal fade in <%= object.model_name.singular %>-modal" id="modal-default">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">×</span></button>
-        <h4 class="modal-title"><%=t "helpers.links.new" %> <%= model.model_name.human %></h4>
+        <h4 class="modal-title"><%=t "helpers.links.new" %> <%= object.model_name.human %></h4>
       </div>
-      <%= simple_form_for model.new do |f| %>
+      <%= simple_form_for object do |f| %>
         <div class="modal-body">
-          <%= render "#{model.name.underscore.pluralize}/fields", f: f %>
+          <%= render partial, object: object, f: f %>
         </div>
         <div class="modal-footer">
           <%= f.submit class: "btn btn-primary" %>

data/lib/zutils/version.rb

@@ -1,3 +1,3 @@
 module Zutils
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zutils
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ricardo Viana
@@ -68,6 +68,7 @@ files:
 - app/assets/javascripts/zutils.js
 - app/assets/stylesheets/zutils.scss
 - app/views/shared/_action_links.html.erb
+- app/views/shared/_fields.html.erb
 - app/views/shared/_form.html.erb
 - app/views/shared/_index.html.erb
 - app/views/shared/_list.html.erb