my_admin 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2QzYzliZDkzMTAxNTkyYTMyZDk3ZmUwZjUxNDY3NzJiN2VlMWIyNA==
+    ZDhhNjhjNzQzOGEzZjM2ZjJiZmJkMTFkNmI1MWVhNDgzZDgyOWZiMg==
   data.tar.gz: !binary |-
-    NGExYjJlMjFiNzA1MGYxMjAyM2ZlMWIxZDA2MjVhNjgzOGVhYjU0ZA==
+    MmNhOTE3YmY1ZjVjZWQ0NWVkYWYxZWFhYTMxZWU3YWM0NjQxYjJiYw==
 SHA512:
   metadata.gz: !binary |-
-    MWY4NjgwMzY1ODFiZDMwNGVlMGM5ZjdhNjQ4ODE0ODhhYjQxMDFhY2YwOWFh
-    ODViMWVhYTk1MmRlZDI2NmQ2N2JlNTlhOGJjNWQxNGMyY2NiYzc2MTY5Zjhl
-    ZGQ4MDhhMDk5NmEzODNmOGI5OWIxN2ExOTI0MTY1YmVhMTE3NzU=
+    ODYwNWFjNDUwNTA1YTA4NmU0NzI4Njg4NjU1ZWM3YmM0YjA3N2VmOWVlMWQx
+    Njg1ZWI2NGQyMmVlNDA0ODc3MDViZmZhMjU4MjdhMTUzMzJiODdiY2NlMWU2
+    Y2NmZjRhMTFhNjEyNTYxNmQ1YWZiZGNlMzFlNDE5ZmE2YmI3YmM=
   data.tar.gz: !binary |-
-    NTc4ZmEwYjc0MmRiYjkxYjNkOGY3M2U5N2FjNTI2ZGY4Y2EwMDVkNTg4NTMy
-    NDNiZDM0OTIyNGQ1NjIwZmNiM2U5OWIyYmRmZDhlZTI5Y2NkNTNmZWNjNTkw
-    NzIyZjY4ZjVhOGQ4N2VmMGQyMzY2ZDNmMDcxMzc4Nzg2NTk0N2Y=
+    NTg2YmI3ZTFkZDBmYWM0OGI2NzMyZTE2OThmMjRjMDRhMGZjNTQ2NWNhZTll
+    YTdjZDMxYmIwYTI2NThiYzYxNTQ2ZGQ4NTVmZjljNTVmYjVlZmU2ZWUzNDY0
+    MjRkM2QyYzI3NTQxYTI2ZDRkYTFkMzc5ZGY3MmNmYWNhNGU2ZmM=

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.idea/

data/README.md

@@ -1,9 +1,15 @@
-## Instalando MyAdmin (Para novos Projetos)
+# MyAdmin [![Gem Version](https://badge.fury.io/rb/my_admin.svg)](http://badge.fury.io/rb/my_admin) 
+
+[![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=28BWBUS3SRU8G&lc=BR&item_name=Support%20our%20open%2dsource%20initiatives&item_number=GadboxOpenS&currency_code=BRL&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted "Donate once-off to this project using Paypal")
+
+> Um admin para Ruby on Rails
+
+## Instalando MyAdmin
 
 Adicione em seu GemFile:
 
 ```ruby
-gem 'my_admin', git: 'git://github.com/marcosvgs/my_admin.git'
+gem 'my_admin'
 ```
 
 Execute o comando ‘bundle’ para atualizar o Gemfile.lock.
@@ -21,13 +27,7 @@ O comando acima irá criar os seguintes arquivos:
 
 Execute ‘rake db:migrate’ para criar as tabelas do MyAdmin.
 
-Para finalizar execute o comando abaixo para criar os links simbólicos para os assets do MyAdmin.
-
-```console
-rails g my_admin:create_public
-```
-
-Após criar os assets, rode sua aplicação ‘rails s’. Assim o my_admin já estará disponível em ‘http://0.0.0.0:3000/admin’ 
+Inicie sua aplicação ‘rails s’. Assim o MyAdmin já estará disponível em ‘http://localhost:3000/admin’ 
 
 ## Configurações Geral
 
@@ -404,4 +404,4 @@ Caso precise alterar a estrutura da área do qualquer campo, é possível criand
 
 Para ver como cada tipo de campo se comporta por padrão, acesse os arquivos no diretório/gems/my_admin/views/my_admin/fields/.
 
-Obs: Caso um dos arquivos não seja criado, o MyAdmin irá utilizar a view do tipo default.
+Obs: Caso um dos arquivos não seja criado, o MyAdmin irá utilizar a view do tipo default.

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

@@ -8,4 +8,12 @@
 
 .show_color{
   height: 20px;
+}
+
+#nprogress .spinner{
+    top: 55px;
+}
+
+#nprogress .bar{
+    background: #31B4FF;
 }

data/app/controllers/my_admin/models_controller.rb

@@ -44,7 +44,9 @@ class MyAdmin::ModelsController < MyAdmin::MyAdminController
           @objects = filter_filter(@application, @model, field, @objects)
         end
       end
+
       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.paginate(:per_page => per_page, :page => params[:page])
       

data/app/helpers/my_admin_field_helper.rb

@@ -163,14 +163,14 @@ module MyAdminFieldHelper
   
   def filter_filter(application, model, field, objects)
     
-    if @objects.respond_to? "my_admin_filter_#{field}"
-      @objects = @objects.send("my_admin_filter_#{field}", params[@model.underscore])
+    if objects.respond_to? "my_admin_filter_#{field}"
+      objects = objects.send("my_admin_filter_#{field}", params[model.underscore])
     else
       object_type = filter_field_type(application, model, field)
-      if @objects.respond_to? "my_admin_filter_type_#{object_type}"
-        @objects.send("my_admin_filter_type_#{object_type}", @model, field, params[@model.underscore])
+      if objects.respond_to? "my_admin_filter_type_#{object_type}"
+        objects.send("my_admin_filter_type_#{object_type}", model, field, params[model.underscore])
       else
-        @objects = @objects.my_admin_filter(@model, field, params[@model.underscore])
+        objects = objects.my_admin_filter(model, field, params[model.underscore])
       end
     end
     

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

@@ -92,7 +92,7 @@
 													<%= 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, :confirm => I18n.t('my_admin.messages.models.confirm_remove', :model => @model.title), :class => "btn btn-mini btn-danger") do %>
+												<%= 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') %>
 												

data/lib/my_admin/active_record.rb

@@ -15,7 +15,7 @@ module MyAdmin
           if params[:order_by].present? and params[:order].present?
             order("#{params[:order_by]} #{params[:order]}")
           else
-            where()
+            where("")
           end
         end
 
@@ -23,7 +23,7 @@ module MyAdmin
           if params[field].present? and !params[field].blank?
             where("#{model.table_name}.#{field} like ?", "%#{params[field]}%")
           else
-            where()
+            where("")
           end
         end
 
@@ -31,7 +31,7 @@ module MyAdmin
           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)
           else
-            where()
+            where("")
           end
         end
 
@@ -39,7 +39,7 @@ module MyAdmin
           if params[field].present? and !params[field].blank?
             where("#{model.table_name}.#{field}" => (params[field] == "true"))
           else
-            where()
+            where("")
           end
         end
 
@@ -47,7 +47,7 @@ module MyAdmin
           if params[field].present? and !params[field].blank?
             where("#{model.table_name}.#{field} = :date", {:date => (params[field].to_date rescue nil)})
           else
-            where()
+            where("")
           end
         end
       end 

data/lib/my_admin/version.rb

@@ -1,3 +1,3 @@
 module MyAdmin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/my_admin.gemspec

@@ -10,18 +10,19 @@ Gem::Specification.new do |s|
   s.email       = ["marcosvgs@gmail.com"]
   s.homepage    = ""
   s.summary     = "MyAdmin"
-  s.description = "MyAdmin"
+  s.description = "Content Manager for RoR"
 
   s.rubyforge_project = "my_admin"
+  s.required_ruby_version = ">= 1.9.3"
   
-  s.add_dependency "rails",           "~> 4.1.0"
-  s.add_dependency "breadcrumbs"  ,   "~> 0.1.6"
-  s.add_dependency "dynamic_form" ,   "~> 1.1.4"
-  s.add_dependency "paperclip" ,      "~> 4.2.0"
-  s.add_dependency "will_paginate",   "~> 3.0.7"
-  s.add_dependency "spreadsheet",     "~> 1.0.0"
-  s.add_dependency "htmlentities",    "~> 4.3.2"
-  s.add_dependency "ckeditor",        "~> 4.1.1"
+  s.add_dependency "rails",           "~> 4"
+  s.add_dependency "breadcrumbs"  ,   "~> 0.1"
+  s.add_dependency "dynamic_form" ,   "~> 1.1"
+  s.add_dependency "paperclip" ,      "~> 4.2"
+  s.add_dependency "will_paginate",   "~> 3.0"
+  s.add_dependency "spreadsheet",     "~> 1.0"
+  s.add_dependency "htmlentities",    "~> 4.3"
+  s.add_dependency "ckeditor",        "~> 4.1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Marcos Vinicius von Gal dos Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,113 +16,113 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: ckeditor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.1
-description: MyAdmin
+        version: '4.1'
+description: Content Manager for RoR
 email:
 - marcosvgs@gmail.com
 executables: []
@@ -960,7 +960,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='