my_admin 0.0.12 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: df641e45ba0556970a7e741020b5bf0457444460
-  data.tar.gz: 5b2953be12e37e6177d4b59a1b1b046405b369a3
-SHA512: 
-  metadata.gz: 3d3948614ceb235d9895351958027863076a7f00d5deebb8ed89a4f03b2958a7c884de2e3cc4a00fa348631dc8634635f894d35c43ef394e6d11375f39fd16f5
-  data.tar.gz: dd9a180ebf27774830c5a11326a4dc4e606ce6248ef5f3257a8ce0342814001cb6f7da104f524251420949b28d23dca66415397ae75483bf63929934a51095d3
+---
+SHA1:
+  metadata.gz: a4310aa37b7f6e047efd13b3d9002c99802b3f7d
+  data.tar.gz: c43f564825f78b5841c53c2d0467ea232da7a319
+SHA512:
+  metadata.gz: 7d71e2087d021a09fe50d2efa07746aef8e9fbaa9559b893ed097f0811e9a2ffa8b96dc491a717f909090fce0e9c8088eaea82103940f2b9d3de5fc73b42bf06
+  data.tar.gz: b47f76b8a7ae70178a080e09b20a201dc1ca1308f592bc090cc8f316bef05b387c2b4db2133d65e678cbf7cc565768d8777ddfffcd0ebf1fba8f55d7b0c144e8

data/README.md

@@ -376,27 +376,27 @@ No caso acima você alterará todos os campos que tiverem o nome ‘phone’ de
 
 Porém se você desejar alterar os campos somente de uma grupo, siga a estrutura abaixo, com exemplo de que o grupo se chama “contatos”.
 
-* /app/views/my_admin/contatos/fields/edit/phone.html.erb
-* /app/views/my_admin/contatos/fields/phone.html.erb
-* /app/views/my_admin/contatos/fields/filter/phone.html.erb
+* /app/views/my_admin/applications/contatos/fields/edit/phone.html.erb
+* /app/views/my_admin/applications/contatos/fields/phone.html.erb
+* /app/views/my_admin/applications/contatos/fields/filter/phone.html.erb
 
 O mesmo serve para criar ou editar um tipo de campo para um grupo.
 
-* /app/views/my_admin/contatos/fields/edit/type/unidade.html
-* /app/views/my_admin/contatos/fields/type/unidade.html
-* /app/views/my_admin/contatos/fields/filter/type/unidade.html
+* /app/views/my_admin/applications/contatos/fields/edit/type/unidade.html
+* /app/views/my_admin/applications/contatos/fields/type/unidade.html
+* /app/views/my_admin/applications/contatos/fields/filter/type/unidade.html
 
-Ainda existe a possibilidade de customizar um campo de um modelo especifico. Veja o exemplo abaixo do modelo “User“ dentro do grupo de “contatos”.
+Ainda existe a possibilidade de customizar um campo de um modelo especifico. Veja o exemplo abaixo do modelo “User“.
 
-* /app/views/my_admin/contatos/users/fields/edit/phone.html.erb
-* /app/views/my_admin/contatos/users/fields/phone.html.erb
-* /app/views/my_admin/contatos/users/fields/filter/phone.html.erb
+* /app/views/my_admin/models/users/fields/edit/phone.html.erb
+* /app/views/my_admin/models/users/fields/phone.html.erb
+* /app/views/my_admin/models/users/fields/filter/phone.html.erb
 
 O mesmo para tipo de campo.
 
-* /app/views/my_admin/contatos/users/fields/edit/type/unidade.html
-* /app/views/my_admin/contatos/users/fields/type/unidade.html
-* /app/views/my_admin/contatos/users/fields/filter/type/unidade.html
+* /app/views/my_admin/models/users/fields/edit/type/unidade.html
+* /app/views/my_admin/models/users/fields/type/unidade.html
+* /app/views/my_admin/models/users/fields/filter/type/unidade.html
 
 Obs.: A pasta do modelo deve ser o mesmo nome da tabela do modelo.
 

data/app/assets/javascripts/my_admin/application.js

@@ -12,7 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require turbolinks
+// require turbolinks
 //= require ckeditor/init
 //= require my_admin/plugins/nicescroll/jquery.nicescroll.min
 //= require my_admin/plugins/validation/jquery.validate.min

data/app/controllers/my_admin/configurations_controller.rb

@@ -16,7 +16,7 @@ class MyAdmin::ConfigurationsController < MyAdmin::MyAdminController
   private
   
     def add_breadcrumbs
-      breadcrumbs.add('my_admin_home', send("#{admin_prefix}_path"))
+      breadcrumbs.add('my_admin_home', send("#{admin_prefix}_root_path"))
     end
 
 end

data/app/controllers/my_admin/dashboards_controller.rb

@@ -9,7 +9,7 @@ class MyAdmin::DashboardsController < MyAdmin::MyAdminController
   private
   
     def add_breadcrumbs
-      breadcrumbs.add('my_admin_home', send("#{admin_prefix}_path"))
+      breadcrumbs.add('my_admin_home', send("#{admin_prefix}_root_path"))
     end
   
 end

data/app/controllers/my_admin/first_users_controller.rb

@@ -11,7 +11,7 @@ class MyAdmin::FirstUsersController < MyAdmin::MyAdminController
     if @user.save
       my_admin_sign_in @user
       flash[:notice] = I18n.t("my_admin.messages.user.created")
-      redirect_to send("#{admin_prefix}_path")
+      redirect_to send("#{admin_prefix}_root_path")
     else
       render :new
     end

data/app/controllers/my_admin/models_controller.rb

@@ -20,6 +20,8 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
         end
       end
 
+      @objects = @objects.my_admin_default_scope if @objects.respond_to? :my_admin_default_scope
+
       headers = []
       only = @model.my_admin.export_display
   
@@ -54,6 +56,7 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
       per_page = params[:per_page] || @model.my_admin.per_page
       per_page = @model.my_admin.per_page if params[:per_page].to_i <= 0 rescue @model.my_admin.per_page
       
+      @objects = @objects.my_admin_default_scope if @objects.respond_to? :my_admin_default_scope
       @objects = @objects.paginate(:per_page => per_page, :page => params[:page])
       
       cache_my_admin_params
@@ -188,18 +191,19 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
     end
   
     def get_model
-      @application = MyAdmin::Application.find_by_url(request.url.split("?")[0].split(request.host_with_port).last.split("/")[2]) #(params[:application])
-      @model = @application.find_model_by_url(request.url.split("?")[0].split(request.host_with_port).last.split("/")[3]) #(params[:model])
+      position = admin_prefix.blank? ? 1 : 2
+      @application = MyAdmin::Application.find_by_url(request.url.split("?")[0].split(request.host_with_port).last.split("/")[position]) #(params[:application])
+      @model = @application.find_model_by_url(request.url.split("?")[0].split(request.host_with_port).last.split("/")[position + 1]) #(params[:model])
     end
   
     def add_breadcrumbs
-      breadcrumbs.add('my_admin_home', send("#{admin_prefix}_path"))
+      breadcrumbs.add('my_admin_home', send("#{admin_prefix}_root_path"))
       breadcrumbs.add(@model.title_plural, (params[:action] == 'index') ? nil : model_link(@application, @model))
     end
     
     def verify_permission (permission)
       unless @model.my_admin.can?(permission, my_admin_user)
-        redirect_to send("#{admin_prefix}_path")
+        redirect_to send("#{admin_prefix}_root_path")
         false
       else
         true

data/app/controllers/my_admin/password_controller.rb

@@ -9,7 +9,7 @@ class MyAdmin::PasswordController < MyAdmin::MyAdminController
   def update
     @user = MyAdmin::User.find(my_admin_user.id)
     if (@user.update_attributes(password_params))
-      redirect_to send("#{admin_prefix}_path"), :flash => { :notice => I18n.t("my_admin.messages.user.password_changed") }
+      redirect_to send("#{admin_prefix}_root_path"), :flash => { :notice => I18n.t("my_admin.messages.user.password_changed") }
     else
       render :edit
     end
@@ -18,7 +18,7 @@ class MyAdmin::PasswordController < MyAdmin::MyAdminController
 private
 
   def add_breadcrumbs
-    breadcrumbs.add('my_admin_home', send("#{admin_prefix}_path"))
+    breadcrumbs.add('my_admin_home', send("#{admin_prefix}_root_path"))
     breadcrumbs.add('change_password')
   end
   

data/app/controllers/my_admin/recovers_controller.rb

@@ -31,7 +31,7 @@ class MyAdmin::RecoversController < MyAdmin::MyAdminController
     if (@user.update_attributes(recovers_params))
       @user.update_attribute(:encrypted_recover, nil)
       my_admin_sign_in @user
-      redirect_to send("#{admin_prefix}_path"), :flash => { :notice => I18n.t("my_admin.messages.user.password_changed") }
+      redirect_to send("#{admin_prefix}_root_path"), :flash => { :notice => I18n.t("my_admin.messages.user.password_changed") }
     else
       render :show
     end
@@ -50,7 +50,7 @@ class MyAdmin::RecoversController < MyAdmin::MyAdminController
     end
   
     def verify_login
-      redirect_to send("#{admin_prefix}_path") if my_admin_signed_in?
+      redirect_to send("#{admin_prefix}_root_path") if my_admin_signed_in?
       redirect_to send("unlock_#{admin_prefix}_sessions_path") if my_admin_locked?
     end
     

data/app/controllers/my_admin/sessions_controller.rb

@@ -1,7 +1,7 @@
 class MyAdmin::SessionsController < MyAdmin::MyAdminController
   
   def new
-    redirect_to send("#{admin_prefix}_path") if my_admin_signed_in?
+    redirect_to send("#{admin_prefix}_root_path") if my_admin_signed_in?
     redirect_to send("unlock_#{admin_prefix}_sessions_path") if my_admin_locked?
   end
   
@@ -13,7 +13,7 @@ class MyAdmin::SessionsController < MyAdmin::MyAdminController
     else
       if user.is_active?
         my_admin_sign_in user
-        redirect_to send("#{admin_prefix}_path")
+        redirect_to send("#{admin_prefix}_root_path")
       else
         flash.now[:error] = I18n.t("activerecord.errors.my_admin.user.inactive_user")
         render :new
@@ -32,7 +32,7 @@ class MyAdmin::SessionsController < MyAdmin::MyAdminController
   end
   
   def unlock
-    redirect_to send("#{admin_prefix}_path") if my_admin_signed_in?
+    redirect_to send("#{admin_prefix}_root_path") if my_admin_signed_in?
     redirect_to send("new_#{admin_prefix}_sessions_path") if !my_admin_locked?
   end
   
@@ -44,7 +44,7 @@ class MyAdmin::SessionsController < MyAdmin::MyAdminController
     else
       if user.is_active?
         my_admin_sign_in user
-        redirect_to send("#{admin_prefix}_path")
+        redirect_to send("#{admin_prefix}_root_path")
       else
         flash.now[:error] = I18n.t("activerecord.errors.my_admin.user.inactive_user")
         my_admin_sign_out

data/app/helpers/my_admin_field_helper.rb

@@ -64,90 +64,90 @@ module MyAdminFieldHelper
   end
   
   def edit_field_struct(application, model, field, object, form, show_label=true)
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/edit/#{field}_struct"
-    template = "my_admin/#{application.key}/fields/edit/#{field}_struct" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/edit/#{field}_struct"
+    template = "my_admin/applications/#{application.key}/fields/edit/#{field}_struct" unless lookup_context.exists? template
     template = "my_admin/fields/edit/#{field}_struct" unless lookup_context.exists? template
     
     object_type = field_type(application, model, field, object)
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/edit/type/#{object_type}_struct" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/edit/type/#{object_type}_struct" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/edit/type/#{object_type}_struct" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/edit/type/#{object_type}_struct" unless lookup_context.exists? template
     template = "my_admin/fields/edit/type/#{object_type}_struct" unless lookup_context.exists? template
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/edit/type/default_struct" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/edit/type/default_struct" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/edit/type/default_struct" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/edit/type/default_struct" unless lookup_context.exists? template
     template = "my_admin/fields/edit/type/default_struct" unless lookup_context.exists? template
 
     render :template => template, :locals => {:show_label => show_label, :application => application, :model => model, :field => field, :object => object, :form => form }
   end
   
   def field_content(application, model, field, object)
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/#{field}"
-    template = "my_admin/#{application.key}/fields/#{field}" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/#{field}"
+    template = "my_admin/applications/#{application.key}/fields/#{field}" unless lookup_context.exists? template
     template = "my_admin/fields/#{field}" unless lookup_context.exists? template
     
     object_type = field_type(application, model, field, object)
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/type/#{object_type}" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/type/#{object_type}" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/type/#{object_type}" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/type/#{object_type}" unless lookup_context.exists? template
     template = "my_admin/fields/type/#{object_type}" unless lookup_context.exists? template
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/type/default" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/type/default" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/type/default" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/type/default" unless lookup_context.exists? template
     template = "my_admin/fields/type/default" unless lookup_context.exists? template
     
     render :template => template, :locals => {:application => application, :model => model, :field => field, :object => object }
   end
   
   def edit_field_content(application, model, field, object, form)
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/edit/#{field}"
-    template = "my_admin/#{application.key}/fields/edit/#{field}" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/edit/#{field}"
+    template = "my_admin/applications/#{application.key}/fields/edit/#{field}" unless lookup_context.exists? template
     template = "my_admin/fields/edit/#{field}" unless lookup_context.exists? template
     
     object_type = field_type(application, model, field, object)
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/edit/type/#{object_type}" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/edit/type/#{object_type}" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/edit/type/#{object_type}" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/edit/type/#{object_type}" unless lookup_context.exists? template
     template = "my_admin/fields/edit/type/#{object_type}" unless lookup_context.exists? template
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/edit/type/default" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/edit/type/default" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/edit/type/default" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/edit/type/default" unless lookup_context.exists? template
     template = "my_admin/fields/edit/type/default" unless lookup_context.exists? template
 
     render :template => template, :locals => {:application => application, :model => model, :field => field, :object => object, :form => form }
   end
   
   def filter_field_struct(application, model, field, object, show_label=true)
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/filter/#{field}_struct"
-    template = "my_admin/#{application.key}/fields/filter/#{field}_struct" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/filter/#{field}_struct"
+    template = "my_admin/applications/#{application.key}/fields/filter/#{field}_struct" unless lookup_context.exists? template
     template = "my_admin/fields/filter/#{field}_struct" unless lookup_context.exists? template
     
     object_type = filter_field_type(application, model, field, object)
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/filter/type/#{object_type}_struct" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/filter/type/#{object_type}_struct" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/filter/type/#{object_type}_struct" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/filter/type/#{object_type}_struct" unless lookup_context.exists? template
     template = "my_admin/fields/filter/type/#{object_type}_struct" unless lookup_context.exists? template
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/filter/type/default_struct" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/filter/type/default_struct" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/filter/type/default_struct" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/filter/type/default_struct" unless lookup_context.exists? template
     template = "my_admin/fields/filter/type/default_struct" unless lookup_context.exists? template
 
     render :template => template, :locals => {:show_label => show_label, :application => application, :model => model, :field => field, :object => object }
   end
   
   def filter_field_content(application, model, field, object)
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/filter/#{field}"
-    template = "my_admin/#{application.key}/fields/filter/#{field}" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/filter/#{field}"
+    template = "my_admin/applications/#{application.key}/fields/filter/#{field}" unless lookup_context.exists? template
     template = "my_admin/fields/filter/#{field}" unless lookup_context.exists? template
     
     object_type = filter_field_type(application, model, field, object)
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/filter/type/#{object_type}" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/filter/type/#{object_type}" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/filter/type/#{object_type}" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/filter/type/#{object_type}" unless lookup_context.exists? template
     template = "my_admin/fields/filter/type/#{object_type}" unless lookup_context.exists? template
     
-    template = "my_admin/#{application.key}/#{model.model_tableize}/fields/filter/type/default" unless lookup_context.exists? template
-    template = "my_admin/#{application.key}/fields/filter/type/default" unless lookup_context.exists? template
+    template = "my_admin/models/#{model.model_tableize}/fields/filter/type/default" unless lookup_context.exists? template
+    template = "my_admin/applications/#{application.key}/fields/filter/type/default" unless lookup_context.exists? template
     template = "my_admin/fields/filter/type/default" unless lookup_context.exists? template
 
     render :template => template, :locals => {:application => application, :model => model, :field => field, :object => object }

data/app/helpers/my_admin_model_helper.rb

@@ -25,8 +25,8 @@ module MyAdminModelHelper
   end
   
   def model_template(application, model, action)
-    template = "my_admin/#{application.key}/#{model.model_tableize}/#{action}"
-    template = "my_admin/#{application.key}/models/#{action}" if !lookup_context.exists? template, [], true and !lookup_context.exists? template, [], false
+    template = "my_admin/models/#{model.model_tableize}/#{action}"
+    template = "my_admin/applications/#{application.key}/models/#{action}" if !lookup_context.exists? template, [], true and !lookup_context.exists? template, [], false
     template = "my_admin/models/#{action}" if !lookup_context.exists? template, [], true and !lookup_context.exists? template, [], false
     template
   end

data/app/views/layouts/my_admin.html.erb

@@ -47,10 +47,19 @@
 			<%= render "my_admin/left" %>
 			<div id="main">
 				<div class="container-fluid">
-					<div class="page-header">
+					<<div class="page-header">
 						<div class="pull-left">
 							<h1><%= yield(:title) %></h1>
 						</div>
+						<div class="pull-right">
+							<ul class="minitiles">
+								<%= yield(:minitiles) %>
+							</ul>
+							<ul class="stats">
+								<%= yield(:stats) %>
+							</ul>
+						</div>
+
 					</div>
 					
 					<% if flash[:success] %>

data/app/views/layouts/my_admin_off.html.erb

@@ -40,7 +40,7 @@
 	<body class="<%= yield(:body_class) %> theme-darkblue" data-theme="theme-darkblue">
   	<div class="wrapper">
 			<h1>
-				<%= link_to send("#{admin_prefix}_path") do %>
+				<%= link_to send("#{admin_prefix}_root_path") do %>
 					<img src="<%= asset_path 'my_admin/logo-big.png' %>" alt="" class='retina-ready' width="59" height="49"><%= MyAdmin.title %>
 				<% end %>
 			</h1>

data/app/views/my_admin/_header.html.erb

@@ -1,12 +1,12 @@
 <div id="navigation">
 	<div class="container-fluid">
-		<%= link_to MyAdmin.title, send("#{admin_prefix}_path"), :id => "brand" %>
+		<%= link_to MyAdmin.title, send("#{admin_prefix}_root_path"), :id => "brand" %>
 		
 		<a href="#" class="toggle-nav" rel="tooltip" data-placement="bottom" title="Toggle navigation"><i class="icon-reorder"></i></a>
 		<ul class='main-nav'>
 			<!-- <li class='active'> -->
 			<li>
-				<%= link_to content_tag(:span, "Dashboard"), send("#{admin_prefix}_path") %>
+				<%= link_to content_tag(:span, "Dashboard"), send("#{admin_prefix}_root_path") %>
 			</li>
 			<% @applications.each do |application| %>
 				<% if application.can?(my_admin_user) %>

data/app/views/my_admin/_header.html.erb.old

@@ -2,7 +2,7 @@
 <div id="header" class="row">
   <div class="span8">
     <h1 class="r">
-      <%= link_to MyAdmin.title, send("#{admin_prefix}_path")  %>
+      <%= link_to MyAdmin.title, send("#{admin_prefix}_root_path")  %>
     </h1>
   </div>
    

data/app/views/my_admin/fields/edit/type/date_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 => "datepick" %>
+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 => "datepick" %>

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

@@ -1,5 +1,5 @@
 <%
-	@collection = [['Todos', nil],['Não', false],['Sim', true]]
-	@selected = params[model.underscore][field] if params[model.underscore].present? and params[model.underscore][field].present?
+	collection = [['Todos', nil],['Não', false],['Sim', true]]
+	selected = params[model.underscore][field] if params[model.underscore].present? and params[model.underscore][field].present?
 %>
-<%= select_tag "#{model.underscore}[#{field.to_s}]", options_for_select(@collection, @selected) %>
+<%= select_tag "#{model.underscore}[#{field.to_s}]", options_for_select(collection, selected) %>

data/app/views/my_admin/fields/filter/type/integer_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 => "integer" %>
+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 => "integer" %>

data/app/views/my_admin/models/_actions.html.erb

@@ -0,0 +1,15 @@
+<% if @model.my_admin.can?(:destroy, my_admin_user) or @model.my_admin.can?(:update, my_admin_user) %>
+	<td>
+		<%= link_to(edit_model_link(@application, @model, object), :class => "btn btn-mini btn-inverse") do %>
+			<i class="icon-edit"></i>
+			<%= I18n.t('my_admin.labels.models.edit') %>
+		<% end if @model.my_admin.can?(:update, my_admin_user) %>
+														
+		<%= link_to(show_model_link(@application, @model, object), :method => :delete, :class => "btn btn-mini btn-danger", data: { confirm: I18n.t('my_admin.messages.models.confirm_remove', :model => @model.title)}) do %>
+			<i class="icon-trash"></i>
+			<%= I18n.t('my_admin.labels.models.remove') %>
+		
+		<% end if @model.my_admin.can?(:destroy, my_admin_user) %>
+		
+	</td>
+<% end %>

data/app/views/my_admin/models/_actions_header.html.erb

@@ -0,0 +1,3 @@
+<% if @model.my_admin.can?(:destroy, my_admin_user) or @model.my_admin.can?(:update, my_admin_user) %>
+  <th></th>
+<% end %>

data/app/views/my_admin/models/index.html.erb

@@ -63,10 +63,8 @@
 										<% end %>
 									</th>
 								<% end %>
+								<%= render model_template(@application, @model, 'actions_header') %>
 								
-								<% if @model.my_admin.can?(:destroy, my_admin_user) or @model.my_admin.can?(:update, my_admin_user) %>
-								  <th></th>
-								<% end %>
 							</tr>
 						</thead>
 						<% unless @objects.blank? %>
@@ -85,21 +83,7 @@
 				  						</td>
 				  					<% end %>
 
-				  					<% if @model.my_admin.can?(:destroy, my_admin_user) or @model.my_admin.can?(:update, my_admin_user) %>
-				  						<td>
-												<%= link_to(edit_model_link(@application, @model, object), :class => "btn btn-mini btn-inverse") do %>
-													<i class="icon-edit"></i>
-													<%= I18n.t('my_admin.labels.models.edit') %>
-												<% end if @model.my_admin.can?(:update, my_admin_user) %>
-																								
-												<%= link_to(show_model_link(@application, @model, object), :method => :delete, :class => "btn btn-mini btn-danger", data: { confirm: I18n.t('my_admin.messages.models.confirm_remove', :model => @model.title)}) do %>
-													<i class="icon-trash"></i>
-													<%= I18n.t('my_admin.labels.models.remove') %>
-												
-												<% end if @model.my_admin.can?(:destroy, my_admin_user) %>
-												
-											</td>
-				  					<% end %>
+				  					<%= render model_template(@application, @model, 'actions'), object: object %>
 									</tr>
 								</tbody>
 							<% end %>

data/app/views/my_admin/password/edit.html.erb

@@ -48,7 +48,7 @@
   
 			  <div class="form-actions">
 			    <%= f.submit I18n.t('my_admin.labels.models.edit'), :class => "btn btn-success" %> 
-			    <%= link_to("Cancelar", send("#{admin_prefix}_path"), :class => "btn") %> 
+			    <%= link_to("Cancelar", send("#{admin_prefix}_root_path"), :class => "btn") %> 
 			  </div>
 
 			</div>

data/config/locales/pt.yml

@@ -34,7 +34,7 @@ pt:
   time:
     formats:
       default: "%d/%m/%Y %H:%M"
-      short: "%d/%m/%y"
+      short: "%d/%m/%Y"
       long: "%d de %B de %Y"
       day_month: "%d de %B"
       only_month: "%B"

data/config/routes.rb

@@ -3,7 +3,8 @@ Rails.application.routes.draw do
   mount Ckeditor::Engine => '/ckeditor'
   
   namespace MyAdmin.url_prefix, :module => "my_admin" do
-    root :to => "dashboards#index", :as => ""
+    
+    root :to => "dashboards#index", :as => "root"
     
     resource :configuration, :only => [:update, :show]
     

data/{lib/generators/my_admin/install/templates/migrations/ckeditor_assets.rb → db/migrate/20151128132449_create_ckeditor_assets.rb}

@@ -1,5 +1,5 @@
 class CreateCkeditorAssets < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :ckeditor_assets do |t|
       t.string  :data_file_name, :null => false
       t.string  :data_content_type
@@ -9,7 +9,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :assetable_type, :limit => 30
       t.string  :type, :limit => 30
 
-      # Uncomment	it to save images dimensions, if your need it
+      # Uncomment it to save images dimensions, if your need it
       t.integer :width
       t.integer :height
 
@@ -19,8 +19,4 @@ class CreateCkeditorAssets < ActiveRecord::Migration
     add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], :name => "idx_ckeditor_assetable_type"
     add_index "ckeditor_assets", ["assetable_type", "assetable_id"], :name => "idx_ckeditor_assetable"
   end
-
-  def self.down
-    drop_table :ckeditor_assets
-  end
 end

data/{lib/generators/my_admin/install/templates/migrations/configurations.rb → db/migrate/20151128142449_create_my_admin_configurations.rb}

@@ -1,6 +1,5 @@
 class CreateMyAdminConfigurations < ActiveRecord::Migration
-
-  def self.up
+  def change
     create_table :my_admin_configurations do |t|
       
       t.string :key
@@ -14,9 +13,4 @@ class CreateMyAdminConfigurations < ActiveRecord::Migration
       
     end
   end
-
-  def self.down
-    drop_table :my_admin_configurations
-  end
-
 end

data/{lib/generators/my_admin/install/templates/migrations/group_permissions.rb → db/migrate/20151128152449_create_my_admin_group_permissions.rb}

@@ -1,5 +1,5 @@
 class CreateMyAdminGroupPermissions < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :my_admin_group_permissions do |t|
       t.integer :permission_id
       t.integer :group_id
@@ -8,9 +8,4 @@ class CreateMyAdminGroupPermissions < ActiveRecord::Migration
     add_index :my_admin_group_permissions, [:permission_id, :group_id], :unique => true, :name => 'my_admin_group_permissions_index'
     
   end
-
-  def self.down
-    remove_index :my_admin_group_permissions, "my_admin_group_permissions_index"
-    drop_table :my_admin_group_permissions
-  end
-end
+end

data/{lib/generators/my_admin/install/templates/migrations/groups.rb → db/migrate/20151128162449_create_my_admin_groups.rb}

@@ -1,5 +1,5 @@
 class CreateMyAdminGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :my_admin_groups do |t|
       t.string :name, :limit => 30, :null => false
       t.text :description
@@ -9,8 +9,4 @@ class CreateMyAdminGroups < ActiveRecord::Migration
     
     add_index :my_admin_groups, :name, :unique => true
   end
-
-  def self.down
-    drop_table :my_admin_groups
-  end
 end

data/{lib/generators/my_admin/install/templates/migrations/locales.rb → db/migrate/20151128172449_create_my_admin_locales.rb}

@@ -1,5 +1,5 @@
 class CreateMyAdminLocales < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :my_admin_locales do |t|
       t.string :name
       t.string :acronym
@@ -8,8 +8,4 @@ class CreateMyAdminLocales < ActiveRecord::Migration
     add_index :my_admin_locales, :name, :unique => true
     add_index :my_admin_locales, :acronym, :unique => true
   end
-
-  def self.down
-    drop_table :my_admin_locales
-  end
-end
+end

data/{lib/generators/my_admin/install/templates/migrations/logs.rb → db/migrate/20151128182449_create_my_admin_logs.rb}

@@ -1,5 +1,5 @@
 class CreateMyAdminLogs < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :my_admin_logs do |t|
       t.integer :user_id, :null => false
       t.string :object, :null => false
@@ -12,8 +12,4 @@ class CreateMyAdminLogs < ActiveRecord::Migration
     
     add_index :my_admin_logs, :user_id
   end
-
-  def self.down
-    drop_table :my_admin_logs
-  end
 end

data/{lib/generators/my_admin/install/templates/migrations/permissions.rb → db/migrate/20151128192449_create_my_admin_permissions.rb}

@@ -1,5 +1,5 @@
 class CreateMyAdminPermissions < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :my_admin_permissions do |t|
       t.string :model, :limit => 75, :null => false
       t.string :name, :limit => 75, :null => false
@@ -8,8 +8,4 @@ class CreateMyAdminPermissions < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :my_admin_permissions
-  end
 end

data/{lib/generators/my_admin/install/templates/migrations/user_groups.rb → db/migrate/20151128202449_create_my_admin_user_groups.rb}

@@ -1,5 +1,5 @@
 class CreateMyAdminUserGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :my_admin_user_groups do |t|
       t.integer :user_id
       t.integer :group_id
@@ -8,9 +8,4 @@ class CreateMyAdminUserGroups < ActiveRecord::Migration
     add_index :my_admin_user_groups, [:user_id, :group_id], :unique => true, :name => 'my_admin_user_groups_index'
     
   end
-
-  def self.down
-    remove_index :my_admin_user_groups, "my_admin_user_groups_index"
-    drop_table :my_admin_user_groups
-  end
-end
+end

data/{lib/generators/my_admin/install/templates/migrations/users.rb → db/migrate/20151128212449_create_my_admin_users.rb}

@@ -1,6 +1,5 @@
 class CreateMyAdminUsers < ActiveRecord::Migration
-
-  def self.up
+  def change
     create_table :my_admin_users do |t|
       t.string :first_name, :default => "", :null => false
       t.string :last_name, :default => "", :null => false
@@ -20,9 +19,4 @@ class CreateMyAdminUsers < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :my_admin_users
-  end
-
 end

data/lib/generators/my_admin/install/install_generator.rb

@@ -20,45 +20,7 @@ module MyAdmin
         directory = File.expand_path('../templates', __FILE__)
 
    			template "config/initializers/my_admin.rb", "config/initializers/my_admin.rb"
-        # template "public/plugins/ckeditor/ckupload.php", "public/my_admin/plugins/ckeditor/ckupload.php"
-
-        #-- "Add Migrations"
-
-        user_class_name = "MyAdminUser"
-        migration_template "migrations/users.rb", "db/migrate/create_#{user_class_name.tableize}.rb"
-        
-        sleep 1
-        class_name = "MyAdminGroup"
-        migration_template "migrations/groups.rb", "db/migrate/create_#{class_name.tableize}.rb"
-        
-        sleep 1
-        class_name = "MyAdminUserGroups"
-        migration_template "migrations/user_groups.rb", "db/migrate/create_#{class_name.tableize}.rb"
-        
-        sleep 1
-        class_name = "MyAdminPermissions"
-        migration_template "migrations/permissions.rb", "db/migrate/create_#{class_name.tableize}.rb"
         
-        sleep 1               
-        class_name = "MyAdminLogs"
-        migration_template "migrations/logs.rb", "db/migrate/create_#{class_name.tableize}.rb"
-        
-        sleep 1
-        class_name = "MyAdminGroupPermissions"
-        migration_template "migrations/group_permissions.rb", "db/migrate/create_#{class_name.tableize}.rb"
-                          
-        sleep 1 
-        class_name = "MyAdminLocales"
-        migration_template "migrations/locales.rb", "db/migrate/create_#{class_name.tableize}.rb"
-        
-        sleep 1 
-        class_name = "MyAdminConfigurations"
-        migration_template "migrations/configurations.rb", "db/migrate/create_#{class_name.tableize}.rb"
-
-        sleep 1 
-        class_name = "CkeditorAssets"
-        migration_template "migrations/ckeditor_assets.rb", "db/migrate/create_#{class_name.tableize}.rb"
-
       end
   
     end

data/lib/my_admin/active_record.rb

@@ -27,6 +27,14 @@ module MyAdmin
           end
         end
 
+        def self.my_admin_filter_type_integer(model, field, params)
+          if params[field].present? and !params[field].blank?
+            where("#{model.table_name}.#{field} = ?", params[field])
+          else
+            where("")
+          end
+        end
+
         def self.my_admin_filter_type_belongs_to(model, field, params)
           if params["#{field.to_s.singularize}_id"].present? and params["#{field.to_s.singularize}_id"].to_i > 0
             where("#{model.table_name}.#{field.to_s.singularize}_id" => params["#{field.to_s.singularize}_id"].to_i)
@@ -68,6 +76,26 @@ module MyAdmin
                              :date_to => ( params[field_name_to].to_datetime.end_of_day rescue nil ) })
         end
 
+
+        def self.my_admin_filter_type_integer_between(model, field, params)
+          field_name_from = "#{field}_from"
+          field_name_to = "#{field}_to"
+
+          field_value_from = params[field_name_from].to_i unless params[field_name_from].blank?
+          field_value_to = params[field_name_to].to_i unless params[field_name_to].blank?
+
+          condition = ""
+          unless field_value_from.nil?
+            condition += "#{model.table_name}.#{field} >= :integer_from"
+          end
+
+          unless field_value_to.nil?
+            condition += " and " unless condition.blank?
+            condition += "#{model.table_name}.#{field} <= :integer_to"
+          end
+
+          where(condition, { :integer_from => field_value_from, :integer_to => field_value_to })
+
       end 
     end
     

data/lib/my_admin/engine.rb

@@ -7,7 +7,11 @@ class Engine < Rails::Engine
   config.assets.precompile += %w( ckeditor/* )
   config.assets.precompile += %w( my_admin/application.css, my_admin/application_locked.css, my_admin/application_off.css )
   config.assets.precompile += %w( my_admin/application.js, my_admin/application_locked.js, my_admin/application_off.js )
+  config.assets.precompile += %w( my_admin_application.css, my_admin_application_locked.css, my_admin_application_off.css )
   config.assets.precompile += %w( my_admin_application.js, my_admin_application_locked.js, my_admin_application_off.js )
+  config.assets.precompile += %w( my_admin/*.ico )
+  config.assets.precompile += %w( my_admin/*.png )
+  config.assets.precompile += %w( my_admin/*.gif )
 
   config.to_prepare do
     ActionView::Base.send :include, MyAdminHelper
@@ -21,5 +25,13 @@ class Engine < Rails::Engine
     
     Mime::Type.register "application/vnd.ms-excel", :xls
   end
+
+  initializer :append_migrations do |app|
+    unless app.root.to_s.match root.to_s
+      config.paths["db/migrate"].expanded.each do |expanded_path|
+        app.config.paths["db/migrate"] << expanded_path
+      end
+    end
+  end
   
 end

data/lib/my_admin/version.rb

@@ -1,3 +1,3 @@
 module MyAdmin
-  VERSION = "0.0.12"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,107 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: my_admin
-version: !ruby/object:Gem::Version 
-  version: 0.0.12
+version: !ruby/object:Gem::Version
+  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Marcos Vinicius von Gal dos Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-03-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-04-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 4.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: breadcrumbs
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: breadcrumbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dynamic_form
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: dynamic_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: paperclip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.2"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: spreadsheet
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: spreadsheet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: htmlentities
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: ckeditor
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: ckeditor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 description: Content Manager for RoR
-email: 
+email:
 - marcosvgs@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -581,14 +609,14 @@ files:
 - app/assets/javascripts/my_admin/plugins/elfinder/files/.tmb/l1_c2NvdHR3aWxsc19hdXR1bW4zLmpwZw1221239274.png
 - app/assets/javascripts/my_admin/plugins/elfinder/files/.tmb/l1_c2NvdHR3aWxsc19idWZmYWxvLmpwZw1221239094.png
 - app/assets/javascripts/my_admin/plugins/elfinder/files/.tmb/l1_c2NvdHR3aWxsc19idXR0ZXJmbHkuanBn1221239286.png
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/Another_file.txt"
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/file.txt"
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/scottwills_underwater2.jpg"
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/scottwills_underwater5.jpg"
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_cat.jpg"
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_fish.jpg"
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_gardens.jpg"
-- "app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_horse.jpg"
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/Another_file.txt'
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/file.txt'
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/scottwills_underwater2.jpg'
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #1/scottwills_underwater5.jpg'
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_cat.jpg'
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_fish.jpg'
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_gardens.jpg'
+- 'app/assets/javascripts/my_admin/plugins/elfinder/files/Folder #2/scottwills_horse.jpg'
 - app/assets/javascripts/my_admin/plugins/elfinder/files/Main-file.txt
 - app/assets/javascripts/my_admin/plugins/elfinder/files/madness_beach.jpg
 - app/assets/javascripts/my_admin/plugins/elfinder/files/madness_boat.jpg
@@ -829,6 +857,7 @@ files:
 - app/views/my_admin/fields/edit/type/clear_text.html.erb
 - app/views/my_admin/fields/edit/type/color.html.erb
 - app/views/my_admin/fields/edit/type/date.html.erb
+- app/views/my_admin/fields/edit/type/date_between.html.erb
 - app/views/my_admin/fields/edit/type/datetime.html.erb
 - app/views/my_admin/fields/edit/type/decimal.html.erb
 - app/views/my_admin/fields/edit/type/default.html.erb
@@ -858,6 +887,7 @@ files:
 - 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/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
 - app/views/my_admin/fields/type/big_decimal.html.erb
@@ -872,6 +902,8 @@ files:
 - app/views/my_admin/fields/type/has_many_edit.html.erb
 - app/views/my_admin/fields/type/paperclip/attachment.html.erb
 - app/views/my_admin/first_users/new.html.erb
+- app/views/my_admin/models/_actions.html.erb
+- app/views/my_admin/models/_actions_header.html.erb
 - app/views/my_admin/models/_field.html.erb
 - app/views/my_admin/models/_filters.html.erb
 - app/views/my_admin/models/_form.html.erb
@@ -891,18 +923,18 @@ files:
 - config/locales/es.yml
 - config/locales/pt.yml
 - config/routes.rb
+- db/migrate/20151128132449_create_ckeditor_assets.rb
+- db/migrate/20151128142449_create_my_admin_configurations.rb
+- db/migrate/20151128152449_create_my_admin_group_permissions.rb
+- db/migrate/20151128162449_create_my_admin_groups.rb
+- db/migrate/20151128172449_create_my_admin_locales.rb
+- db/migrate/20151128182449_create_my_admin_logs.rb
+- db/migrate/20151128192449_create_my_admin_permissions.rb
+- db/migrate/20151128202449_create_my_admin_user_groups.rb
+- db/migrate/20151128212449_create_my_admin_users.rb
 - lib/generators/my_admin/install/USAGE
 - lib/generators/my_admin/install/install_generator.rb
 - lib/generators/my_admin/install/templates/config/initializers/my_admin.rb
-- lib/generators/my_admin/install/templates/migrations/ckeditor_assets.rb
-- lib/generators/my_admin/install/templates/migrations/configurations.rb
-- lib/generators/my_admin/install/templates/migrations/group_permissions.rb
-- lib/generators/my_admin/install/templates/migrations/groups.rb
-- lib/generators/my_admin/install/templates/migrations/locales.rb
-- lib/generators/my_admin/install/templates/migrations/logs.rb
-- lib/generators/my_admin/install/templates/migrations/permissions.rb
-- lib/generators/my_admin/install/templates/migrations/user_groups.rb
-- lib/generators/my_admin/install/templates/migrations/users.rb
 - lib/generators/my_admin/install/templates/public/plugins/ckeditor/ckupload.php
 - lib/generators/my_admin/model/model_generator.rb
 - lib/generators/my_admin/model/templates/controllers/controller.rb
@@ -917,40 +949,33 @@ files:
 - lib/my_admin/locales.rb
 - lib/my_admin/model_configuration.rb
 - lib/my_admin/paperclip.rb
-- lib/my_admin/paperclip_processors/cropper.rb
-- lib/my_admin/paperclip_processors/rotator.rb
 - lib/my_admin/string.rb
 - lib/my_admin/to_xls.rb
 - lib/my_admin/version.rb
 - lib/my_admin/will_paginate/bootstrap_link_renderer.rb
 - lib/my_admin/yml_manage.rb
 - my_admin.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: my_admin
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MyAdmin
 test_files: []
-

data/lib/my_admin/paperclip_processors/cropper.rb

@@ -1,20 +0,0 @@
-module Paperclip
-  class Cropper < Thumbnail
-
-    def transformation_command
-      if crop_command
-        crop_command + super.join(" ").gsub(/ -crop \S+/, '')
-      else
-        super
-      end
-    end
-
-    def crop_command
-      target = @attachment.instance
-      if target.cropping?
-        " -crop '#{target.crop_w}x#{target.crop_h}+#{target.crop_x}+#{target.crop_y}' "
-      end
-    end
-
-  end
-end

data/lib/my_admin/paperclip_processors/rotator.rb

@@ -1,25 +0,0 @@
-module Paperclip
-  class Rotator < Thumbnail
-    
-    attr_accessor :rotate
-    
-    def initialize file, options = {}, attachment = nil
-      super
-      @rotate = options[:rotate]
-    end
-    
-    def transformation_command
-      if rotate_command
-        super.join(" ") + rotate_command
-      else
-        super
-      end
-    end
-    
-    def rotate_command
-      unless @rotate.blank?
-        " -background None -rotate #{@rotate} "
-      end
-    end
-  end
-end