admix 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b05ffa4c03a0d15e77185fbb90f21e9a38ebd1
-  data.tar.gz: 80a0dba9db1bf5346a8704be257cf123038de522
+  metadata.gz: 1104df915a5f8b576192765e4455771056ab0238
+  data.tar.gz: d4f8d7f55e283fc5856bdcc8bc7d78d9b9cb7cac
 SHA512:
-  metadata.gz: 9a2aece9515386b375e108f7a15d0baf1b574420f0ae0e908ca9f50574c113d4705c4106b172ef65fa1cfb0f7e3b7766388d2dcf8e3b0ba5e242aaea7f2aad3f
-  data.tar.gz: e48dfdf093ae3ef674592b03de23e4817032b8791fea3b3212e5c09392f2e49a9c0bbc817e5d4f5dec69bd718de58243a8f364e2db469fdc8f2110d7c267c04b
+  metadata.gz: 1eaad3d160553605376755a46308425ce125ed9857afae5add78157e819f3e7af40050a954533baa07b6a3d1865e6aef85a4d7ceeb442661aff8afd98710bb0a
+  data.tar.gz: 247e21377d6311a4d7a4458f0d30b434d403f4667934a5384d8c2194d0f95b5747782bb5d2dcdb1f26f7fb05ae8e3d752b9ef8bf3f36c0387bd3fb79719021ee

data/app/assets/javascripts/admix/application.js.coffee

@@ -15,12 +15,11 @@
 #= require jquery.qtip.js
 #= require jquery.globalmoney
 #= require ckeditor/init
-#= require jquery.meio.mask.min
 #= require jquery.ui.addresspicker
-
 #= require angular.min
 #= require angular-ui.min
 #= require gmaps
+#= require inputs_masks
 
 
 Backbone.emulateHTTP = true
@@ -54,12 +53,6 @@ $ ->
       dateFormat: "dd/mm/yy"
       altField: $(this).next()
 
-  $(".cell, .phone").livequery ->
-    $(@).setMask('(84) 9999-9999')
-
-  $(".cep").livequery ->
-    $(@).setMask('99999-999')
-
   # window.admix = angular.module('admix', ['ui'])
   #   .config(["$httpProvider", function(provider) {
   #     provider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content');

data/app/views/admix/inherited/_actions.haml

@@ -1,5 +1,6 @@
 .well
-  = link_to "#{t('admix.crud.new.link')} " + t("#{@collection_name}.#{@collection_name.singularize}"), new_resource_url, class: 'btn'
+  - if not ['new'].include? params[:action]
+    = link_to "#{t('admix.crud.new.link')} " + t("#{@collection_name}.#{@collection_name.singularize}"), new_resource_url, class: 'btn'
   = link_to t('admix.crud.list.title', resources: t("#{@collection_name}.#{@collection_name}")), collection_url, class: 'btn'
   - if not ['index', 'edit'].include? params[:action]
     - if not resource.nil? and not resource.new_record?

data/lib/admix/version.rb

@@ -2,7 +2,7 @@ module Admix
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 26
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admix
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Sadjow Leão
@@ -31,42 +31,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: mix-rails-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: mix-rails-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/admix/registrations_controller.rb
-- app/controllers/admix/rest_controller.rb
 - app/controllers/admix/inherited_controller.rb
 - app/controllers/admix/sessions_controller.rb
 - app/controllers/admix/dashboard_controller.rb
@@ -1184,18 +1183,6 @@ files:
 - app/helpers/admix_helper.rb
 - app/mailers/admix_mailer.rb
 - app/views/admix/dashboard/index.html.haml
-- app/views/admix/rest/_empty_grid.haml
-- app/views/admix/rest/_column_actions.haml
-- app/views/admix/rest/new.html.haml
-- app/views/admix/rest/_grid.haml
-- app/views/admix/rest/_grid_actions.haml
-- app/views/admix/rest/form.html.haml
-- app/views/admix/rest/edit.html.haml
-- app/views/admix/rest/index.html.haml
-- app/views/admix/rest/_actions.haml
-- app/views/admix/rest/show.html.haml
-- app/views/admix/rest/_grid_columns.haml
-- app/views/admix/rest/_form_config.haml
 - app/views/admix/inherited/_empty_grid.haml
 - app/views/admix/inherited/_column_actions.haml
 - app/views/admix/inherited/new.html.haml

data/app/controllers/admix/rest_controller.rb

@@ -1,46 +0,0 @@
-class Admix::RestController < Admix::AdmixController
-  
-  inherit_resources
-
-  before_filter -> {
-    if defined?(parent_type)
-      breadcrumbs.add t("#{parent_type.to_s.gsub('_', '').pluralize}.#{parent_type.to_s.gsub('_', '').pluralize}") , polymorphic_path([:admix, parent_class])
-      breadcrumbs.add "#{parent.name}" , parent_url
-    end
-  }
-
-  before_filter -> { breadcrumbs.add t("#{collection_name}.#{collection_name}"), collection_url, :i18n => false }
-  before_filter -> { breadcrumbs.add "#{crumb_field}" , resource_url, :i18n => false } , except: [:index, :new, :create ]
-  before_filter -> { breadcrumbs.add t("admix.crud.new.title"), :i18n => false } , only: [:new ]
-  before_filter -> { @crumb_field = crumb_field } , only: [:edit ]
-  
-  protected
-
-  def crumb_field
-    field_name = if resource.respond_to?(:name)
-      :name
-    elsif resource.respond_to?(:title)
-      :title
-    elsif resource.respond_to?(:email)
-      :email
-    else
-      raise "Implement crumb_field method in #{self}"
-    end
-
-    resource[field_name]
-
-  end
-
-  def load_grid
-    @grid = initialize_grid(resource_class)
-  end
-
-  def collection_name
-    @collection_name = resource_class.to_s.underscore.pluralize.gsub("::", "_")
-  end
-
-  def resource_name
-    resource_class.to_s.downcase
-  end
-
-end

data/app/views/admix/rest/_actions.haml

@@ -1,7 +0,0 @@
-.well
-  = link_to "#{t('admix.crud.new.link')} " + t("#{@collection_name}.#{@collection_name.singularize}"), new_resource_url, class: 'btn'
-  = link_to t('admix.crud.list.title', resources: t("#{@collection_name}.#{@collection_name}")), collection_url, class: 'btn'
-  - if not ['index', 'edit'].include? params[:action]
-    - if not resource.nil? and not resource.new_record?
-      = link_edit(resource, t('admix.crud.edit.link'), 'btn-primary')
-      = link_destroy(resource, t('admix.crud.destroy.link'), 'btn-danger')

data/app/views/admix/rest/_column_actions.haml

@@ -1,3 +0,0 @@
-- grid.column do |obj|
-  - content_tag :div do
-    = render partial: 'grid_actions', locals: {obj:obj}

data/app/views/admix/rest/_empty_grid.haml

@@ -1,3 +0,0 @@
-.well
-  = t('admix.alerts.no_records_found')
-  = link_to(t('admix.links.new_record'), new_resource_url) + '.'

data/app/views/admix/rest/_grid.haml

@@ -1,5 +0,0 @@
-= grid(@grid, show_filters: :when_filtered) do |grid|
-  
-  - grid.blank_slate partial:  "empty_grid"
-  
-  = render partial: 'grid_columns', locals: {grid: grid}

data/app/views/admix/rest/_grid_actions.haml

@@ -1 +0,0 @@
-= grid_actions_for(obj)

data/app/views/admix/rest/_grid_columns.haml

@@ -1,11 +0,0 @@
-- if resource_class.column_names.include? 'name'
-  - grid.column name: input_label(:defaults, :name), attribute: 'name' do |obj|
-    - obj.name
-- elsif resource_class.column_names.include? 'title'
-  - grid.column name: input_label(:defaults, :title), attribute: 'title' do |obj|
-    - obj.title
-- elsif resource_class.column_names.include? 'email'
-  - grid.column name: input_label(:defaults, :email), attribute: 'email' do |obj|
-    - obj.email
-
-- column_actions(grid)

data/app/views/admix/rest/edit.html.haml

@@ -1,5 +0,0 @@
-- collection_name = resource_class.to_s.downcase.pluralize
-- resource_name = resource_class.to_s.downcase
-= render 'actions'
--#%h1= t('admix.crud.edit.title', resource: resource[@crumb_field])
-= render file: 'admix/rest/form'

data/app/views/admix/rest/form.html.haml

@@ -1,50 +0,0 @@
-- array_of_resources = [:admix]
-- if defined? parent_type
-  - array_of_resources << parent_type
-- array_of_resources << resource
-
-= simple_form_for array_of_resources, :html => {:name => 'AdmixForm', :class => 'form-admix', 'ng-controller' => 'FormController' }, wrapper: :bootstrap  do |f|
-  %h1 {{method}}
-  = render partial: 'form_config', locals: {f:f}
-  = f.error_notification
-
-  .row-fluid
-    .span7
-      .row-fluid  
-        .span12
-          .tabbable.tabs-left
-            %ul#admix_form_tabs.nav.nav-tabs
-              - if content_for?(:nav_tabs)
-                = content_for(:nav_tabs)
-              - elsif @admix_tabs 
-                - @admix_tabs.each do |tab|
-                  = tab.header
-            .tab-content.well
-              - if content_for?(:tabs_content)
-                = content_for(:tabs_content)
-              - elsif @admix_tabs
-                - @admix_tabs.each do |tab|
-                  .tab-pane{id: tab.tab_id, class: (tab.options[:first] ? 'active' : '')}
-                    .span12
-                      .row-fluid
-                        = tab.content
-    .span4
-      %ul.nav.nav-list.well
-        %li
-          .div
-            = f.button :submit, class: 'btn-primary'
-            = link_to t('admix.crud.cancel'), collection_url, class: 'btn'
-            - if not resource.nil? and not resource.new_record?
-              = link_destroy(resource, t('admix.crud.destroy.link'), 'btn-danger')
-        - if content_for?(:form_options)
-          %li.nav-header Opções
-          %li
-            = content_for(:form_options)
-        
-
-  = content_for(:after_inner_form)
-= content_for(:after_form)
-:coffeescript
-  $('#admix_form_tabs a').click (e) ->
-    e.preventDefault()
-    $(this).tab('show')

data/app/views/admix/rest/index.html.haml

@@ -1,3 +0,0 @@
-= render 'actions'
--#%h1= t('admix.crud.listing', resources: t("#{@collection_name}.#{@collection_name}"))
-= render partial: 'grid'

data/app/views/admix/rest/new.html.haml

@@ -1,3 +0,0 @@
-= render 'actions'
--#%h1= t('admix.crud.new.title')
-= render file: 'admix/rest/form'

data/app/views/admix/rest/show.html.haml

@@ -1,3 +0,0 @@
-= render 'actions'
--#%h1= t('admix.crud.show.title')
-= render partial: 'show', locals: {resource: resource}