active_admin_pro 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ff4310883bd2de581228f2b14f2a5d7aadef447
-  data.tar.gz: 6501d65856d8887800c3672784f5c3146fbba0dc
+  metadata.gz: 2352d25e3fae68b6bf5e4e906a14e61d5207a868
+  data.tar.gz: 27f15efc18b3947b5fd51ac1de8dc56656a82aa3
 SHA512:
-  metadata.gz: aaca17160b9a63f0df6167e803fba2fb78e0f17d72755254dee3021e019158b1e30c691d8619aa415bef1499cf7723b607c2743925f8e07093bd200702e54862
-  data.tar.gz: 01930d18c14cebc4a2b0553631f0750cb42694b72d59205dd36b2587cdd1267897280374089090cd7793e9165b690e61f0dd79cee4fdd1d18d1bc4f4ffd8fc3d
+  metadata.gz: 4e8ce29e47e3762b2faeb0ebbe0ddf135989660373cc5c148bd58bcdd1cf1c37d24cbbd98693f637d8f9085acf15bbf95486e49c064a8f9e583f319d2ae832cb
+  data.tar.gz: 70a1e7d9c24c133f19c9cc022cb6c62ccd1c81c84831bc37cb303098063bd877f5a08b25920fbc4c14ae6f745232087ba74c326fc378570689b68748fdee67d4

data/app/assets/javascripts/active_admin_pro/components/select_input.js

@@ -26,6 +26,6 @@ App.ready(function() {
     }, 0);
   });
 
-  activateBehavior('.input.country');
-  activateBehavior('.input.select');
+  activateBehavior('.input.country:not(.filter_form_field)');
+  activateBehavior('.input.select:not(.filter_form_field)');
 });

data/app/assets/javascripts/active_admin_pro/components/text_input.js

@@ -5,7 +5,7 @@ App.ready(function() {
   "use strict";
 
   function activateBehavior() {
-    $('.input.stringish:not(.phone), .input.text').each(function() {
+    $('.input.stringish:not(.phone):not(.filter_form_field), .input.text:not(.filter_form_field)').each(function() {
       var container = $(this);
       var input = container.find('input, textarea');
       var label = container.find('label');

data/app/assets/javascripts/active_admin_pro/components/time_zone_input.js

@@ -6,7 +6,7 @@ App.ready(function() {
   var offset, option, select;
 
   function activateBehavior() {
-    $('.input.time_zone select').each(function() {
+    $('.input.time_zone:not(.filter_form_field) select').each(function() {
       select = $(this);
       if (select.val().trim() === '') {
         option = select.find('.time-zone' + timeOffset());

data/app/assets/stylesheets/active_admin_pro/components/boolean_input.scss

@@ -1,4 +1,4 @@
-.input.boolean {
+.input.boolean:not(.filter_form_field) {
   margin-bottom: 2em;
 
   label {

data/app/assets/stylesheets/active_admin_pro/components/select_input.scss

@@ -1,5 +1,5 @@
-.input.country,
-.input.select {
+.input.country:not(.filter_form_field),
+.input.select:not(.filter_form_field) {
   margin-bottom: 2em;
   position: relative;
 

data/app/assets/stylesheets/active_admin_pro/components/string_input.scss

@@ -1,5 +1,5 @@
 // Google Material Design inspired string input with floating label
-.input.stringish {
+.input.stringish:not(.filter_form_field) {
   @include transform(translate3d(0, 0, 0));
   @include transition(all 100ms $transition-timing);
   border-bottom: 1px solid transparent;

data/app/assets/stylesheets/active_admin_pro/components/text_input.scss

@@ -1,4 +1,4 @@
-.input.text {
+.input.text:not(.filter_form_field) {
   margin-bottom: 2em;
   position: relative;
 

data/config/initializers/active_admin.rb

@@ -30,21 +30,6 @@ ActiveAdmin.application.tap do |config|
   config.meta_tags["apple-mobile-web-app-title"]   ||= "Admin"
   config.meta_tags["viewport"]                     ||= "initial-scale=1, maximum-scale=1, width=device-width"
 
-  # Add default interfaces for AdminUser and User models in Active Admin if the models exist.
-  admin_user_exists = File.exist?(File.join(Rails.root, "app", "models", "admin_user.rb"))
-  admin_user_registration_exists = File.exist?(File.join(Rails.root, "app", "admin", "admin_user.rb"))
-
-  if admin_user_exists && !admin_user_registration_exists
-    config.load_paths.unshift File.join(File.expand_path("../../..", __FILE__), "lib", "activeadmin_pro", "admin_user")
-  end
-
-  user_exists = File.exist?(File.join(Rails.root, "app", "models", "user.rb"))
-  user_registration_exists = File.exist?(File.join(Rails.root, "app", "admin", "user.rb"))
-
-  if user_exists && !user_registration_exists
-    config.load_paths.unshift File.join(File.expand_path("../../..", __FILE__), "lib", "activeadmin_pro", "user")
-  end
-
   # Add route and controller for Summernote's image uploads
   config.load_paths.unshift File.join(File.expand_path("../../..", __FILE__), "lib", "activeadmin_pro", "summernote_image")
 end

data/config/locales/en.yml

@@ -20,36 +20,6 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
-  activerecord:
-    attributes:
-      admin_user:
-        created_at: Created
-        current_sign_in_at: Current Session
-        current_sign_in_ip: Current IP Address
-        email: Email Address
-        last_sign_in_at: Last Session
-        last_sign_in_ip: Last IP Address
-        name: Full Name
-        sign_in_count: Number of Sessions
-        updated_at: Updated
-      user:
-        created_at: Created
-        current_sign_in_at: Current Session
-        current_sign_in_ip: Current IP Address
-        email: Email Address
-        last_sign_in_at: Last Session
-        last_sign_in_ip: Last IP Address
-        name: Full Name
-        sign_in_count: Number of Sessions
-        updated_at: Updated
-    models:
-      admin_user:
-        one: Admin User
-        other: Admin Users
-      user:
-        one: User
-        other: Users
-
   time:
     formats:
       short: "%h %e, %Y %l:%M %p"

data/lib/active_admin_pro/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminPro
-  VERSION = "0.1.1"
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_pro
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brian Pattison
@@ -463,10 +463,8 @@ files:
 - config/initializers/active_admin.rb
 - config/locales/en.yml
 - lib/active_admin_pro.rb
-- lib/active_admin_pro/admin_user/admin_user.rb
 - lib/active_admin_pro/engine.rb
 - lib/active_admin_pro/summernote_image/summernote_image.rb
-- lib/active_admin_pro/user/user.rb
 - lib/active_admin_pro/version.rb
 - lib/generators/activeadmin_pro/install_generator.rb
 - lib/tasks/activeadmin_pro_tasks.rake

data/lib/active_admin_pro/admin_user/admin_user.rb

@@ -1,52 +0,0 @@
-ActiveAdmin.register AdminUser do
-  permit_params :name, :email, :password
-
-  filter :name
-  filter :email
-
-  index do
-    selectable_column
-    id_column
-    column :name
-    column :email
-    actions
-  end
-
-  form do |f|
-    inputs "#{t('activerecord.models.admin_user', count: 1)} Details" do
-      input :name
-      input :email
-      input :password if f.object.new_record?
-    end
-    actions
-  end
-
-  show do
-    attributes_table do
-      row :name
-      row :email
-      row :sign_in_count
-      row :current_sign_in_at
-      row :last_sign_in_at
-      row :current_sign_in_ip
-      row :last_sign_in_ip
-      row :created_at
-      row :updated_at
-    end
-    active_admin_comments
-  end
-
-  member_action :sign_in_as, method: :get do
-    sign_in(resource, bypass: true)
-    redirect_to "/"
-  end
-
-  action_item :become_user, only: :show do
-    # The path `sign_in_as_admin_admin_user_path` looks confusing as hell.
-    # Here's what's up:
-    #   The member action is: `sign_in_as`
-    #   The namespace is:     `admin`
-    #   The controller is:    `admin_user`
-    link_to("Become User", sign_in_as_admin_admin_user_path(admin_user))
-  end
-end

data/lib/active_admin_pro/user/user.rb

@@ -1,53 +0,0 @@
-ActiveAdmin.register User do
-  permit_params :name, :email, :password
-
-  filter :name
-  filter :email
-
-  index do
-    selectable_column
-    id_column
-    column :name
-    column :email
-    actions
-  end
-
-  form do |f|
-    inputs "#{t('activerecord.models.user', count: 1)} Details" do
-      input :name
-      input :email
-      input :password if f.object.new_record?
-    end
-    actions
-  end
-
-  show do
-    attributes_table do
-      row :name
-      row :email
-      row :sign_in_count
-      row :current_sign_in_at
-      row :last_sign_in_at
-      row :current_sign_in_ip
-      row :last_sign_in_ip
-      row :created_at
-      row :updated_at
-    end
-    active_admin_comments
-  end
-
-  member_action :become, method: :post do
-    sign_in(resource, bypass: true)
-    redirect_to "/"
-  end
-
-  action_item :become_user, only: :show do
-    # The path `become_admin_user_path` is confusing as
-    # hell because we're not signing in as an admin user.
-    # Here's what's up:
-    #   The member action is: `become`
-    #   The namespace is:     `admin`
-    #   The controller is:    `user`
-    link_to("Become User", become_admin_user_path(user), method: :post)
-  end
-end