my_admin 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd68a7e9716e15df35d850eaebfc2a12bdb9436
-  data.tar.gz: 3c919a4febd16e6fefc8775518e88b34767514da
+  metadata.gz: 57c58e480841d6bc60fd59c6c1191771a98ac242
+  data.tar.gz: 4d0734b87d3409416f30f80b2d66d07fed4d5e39
 SHA512:
-  metadata.gz: 466081411ceb304451bb2c3148049a79780b29b913474f6c1cf6833cf21539d9470b61a3947f54bafc65a77564d0256d26105c1c2c3c68ef7b9005add044f47d
-  data.tar.gz: 05095bc9dd6926e559395ac8efd298e9af10a1ce9021c7630084073f332f0536cd9f28e93141e830360f748426f1053386a4c5d3bfdbee55d47ae40fbab1d9ae
+  metadata.gz: 7b4e5ebf6e599d6c535e7e00ddad32805a75b970492f8211861e0e107da109746854d597a65edb629054e2b733fd6758a8efd14a31fe0276316c8536ef764cdb
+  data.tar.gz: 3d8c93c93760e11833c8cbf222c28f73ebf144a723a56c0ecde5ffa9c572efeb26c6af7dc4568eec62a14b6b11fff9c5f8210c70596cf1c903d6601cc46876ea

data/app/assets/stylesheets/my_admin/application.css

@@ -23,6 +23,7 @@
  *= require my_admin/plugins/datepicker/datepicker
  *= require my_admin/plugins/timepicker/bootstrap-timepicker.min
  *= require my_admin/plugins/xeditable/bootstrap-editable
+ *= require my_admin/plugins/icheck/all
  *= require my_admin/style
  *= require my_admin/themes
  *= require my_admin/my_admin

data/app/helpers/my_admin_field_helper.rb

@@ -25,6 +25,14 @@ module MyAdminFieldHelper
   	collection ||= []
   	collection
   end
+
+  def field_default_value(application, model, field, object)
+    block = field_setting(model, field, :default_value)
+    unless block.blank?
+      block = instance_exec object, &(block) if block.class == Proc
+    end
+    block
+  end
   
   def field_hint(application, model, field, type)
     content_tag(:code, I18n.t!("activerecord.hint.#{model.i18n}.#{field}.#{type}"), :class => "help-block") rescue ""

data/app/views/my_admin/fields/filter/type/belongs_to.html.erb

@@ -8,4 +8,4 @@
 	collection_selected = params[model.underscore][field_name] if params[model.underscore].present? and params[model.underscore][field_name].present?
 	#collection_selected = object.send(field.to_s.singularize).id unless object.send(field.to_s.singularize).blank?
 %>
-<%= select_tag "#{model.underscore}[#{field_name}]", options_for_select(collection, collection_selected) %>
+<%= select_tag "#{model.underscore}[#{field_name}]", options_for_select(collection, collection_selected), { :class => "select2-me input-large" } %>

data/app/views/my_admin/fields/filter/type/checkbox_list.html.erb

@@ -0,0 +1,18 @@
+<%
+	field_name = "#{field.to_s.singularize}"
+
+	collection = field_collection(application, model, field, object)
+	default_value = field_default_value(application, model, field, object) || []
+
+	collection_selected = params[model.underscore][field_name].map { |i| i.to_i } if params[model.underscore].present? and params[model.underscore][field_name].present?
+
+	collection_selected ||= default_value
+
+	collection.each do |item| %>
+
+	<div class="check-line">
+		<%= check_box_tag "#{model.underscore}[#{field.to_s}][]", item.id, collection_selected.include?(item.id), id: "#{model.underscore}_#{field.to_s}_#{item.id}", class: "icheck-me", "data-skin" => "flat", "data-color" => "blue" %>
+		<%= label_tag "#{model.underscore}_#{field.to_s}_#{item.id}", item.to_s, class: "inline" %>
+	</div>
+
+<% end %>

data/app/views/my_admin/fields/filter/type/date_between.html.erb

@@ -1,8 +1,11 @@
 <% field_name_from = "#{field}_from" %>
 <% field_name_to = "#{field}_to" %>
 
+<% default_value = field_default_value(application, model, field, object) || [] %>
+
 <% val = nil %>
 <% val = params[model.underscore][field_name_from] if params[model.underscore].present? and params[model.underscore][field_name_from].present? %>
+<% val ||= default_value.first %>
 
 <%= text_field_tag "#{model.underscore}[#{field_name_from}]", val, :class => "datepick" %>
 até
@@ -10,5 +13,6 @@ até
 
 <% val = nil %>
 <% val = params[model.underscore][field_name_to] if params[model.underscore].present? and params[model.underscore][field_name_to].present? %>
+<% val ||= default_value.last %>
 
 <%= text_field_tag "#{model.underscore}[#{field_name_to}]", val, :class => "datepick" %>

data/app/views/my_admin/fields/filter/type/float_between.html.erb

@@ -0,0 +1,14 @@
+<% field_name_from = "#{field}_from" %>
+<% field_name_to = "#{field}_to" %>
+
+<% val = nil %>
+<% val = params[model.underscore][field_name_from] if params[model.underscore].present? and params[model.underscore][field_name_from].present? %>
+
+<%= text_field_tag "#{model.underscore}[#{field_name_from}]", val, :class => "price_format" %>
+até
+
+
+<% val = nil %>
+<% val = params[model.underscore][field_name_to] if params[model.underscore].present? and params[model.underscore][field_name_to].present? %>
+
+<%= text_field_tag "#{model.underscore}[#{field_name_to}]", val, :class => "price_format" %>

data/app/views/my_admin/recover_mailer/send_recover_mail.html.erb

@@ -3,7 +3,7 @@
 <div style="width:100%; margin:0; padding:30px 0; background:#f8f8f8;">
 	<div style="width:560px; padding:40px; background:#fff; border-top:4px solid #0f6db3; box-shadow:1px 2px 2px 0 rgba(0,0,0,.1); margin:0 auto;">
 		<div>
-			<img src="<%=root_url%>images/logo.png" alt="My admin" style="float:left;">
+			<img src="/images/logo.png" alt="My admin" style="float:left;">
 			<h2 style="float:right; font-family:'core_sans_m_45_regular'; font-weight:normal; font-size:27px; color:#0f6db3; margin:40px 0 15px;">
 				Recuperar Senha
 			</h2>

data/lib/generators/my_admin/model/model_generator.rb

@@ -9,7 +9,7 @@ module MyAdmin
       
       def generate_install
         directory = File.expand_path('../templates', __FILE__)
-        template "controllers/controller.rb", "app/controllers/my_admin/#{controller_name.downcase}_controller.rb"
+        template "controllers/controller.rb", "app/controllers/my_admin/#{model.tableize}_controller.rb"
         
         File.open("#{Rails.root}/config/initializers/my_admin.rb", "a+"){|f| f << "\nMyAdmin::Application.add([#{model.camelize}])" }
         

data/lib/my_admin/version.rb

@@ -1,3 +1,3 @@
 module MyAdmin
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Marcos Vinicius von Gal dos Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -881,12 +881,14 @@ files:
 - app/views/my_admin/fields/edit/type/time.html.erb
 - app/views/my_admin/fields/filter/type/belongs_to.html.erb
 - app/views/my_admin/fields/filter/type/boolean.html.erb
+- app/views/my_admin/fields/filter/type/checkbox_list.html.erb
 - app/views/my_admin/fields/filter/type/date.html.erb
 - app/views/my_admin/fields/filter/type/date_between.html.erb
 - app/views/my_admin/fields/filter/type/datetime.html.erb
 - app/views/my_admin/fields/filter/type/default.html.erb
 - app/views/my_admin/fields/filter/type/default_struct.html.erb
 - app/views/my_admin/fields/filter/type/email.html.erb
+- app/views/my_admin/fields/filter/type/float_between.html.erb
 - app/views/my_admin/fields/filter/type/integer_between.html.erb
 - app/views/my_admin/fields/filter/type/list.html.erb
 - app/views/my_admin/fields/filter/type/list_string.html.erb