admix 0.26.1 → 0.26.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/admix/application.js.coffee +1 -8
- data/app/views/admix/inherited/_actions.haml +2 -1
- data/lib/admix/version.rb +1 -1
- metadata +7 -20
- data/app/controllers/admix/rest_controller.rb +0 -46
- data/app/views/admix/rest/_actions.haml +0 -7
- data/app/views/admix/rest/_column_actions.haml +0 -3
- data/app/views/admix/rest/_empty_grid.haml +0 -3
- data/app/views/admix/rest/_form_config.haml +0 -0
- data/app/views/admix/rest/_grid.haml +0 -5
- data/app/views/admix/rest/_grid_actions.haml +0 -1
- data/app/views/admix/rest/_grid_columns.haml +0 -11
- data/app/views/admix/rest/edit.html.haml +0 -5
- data/app/views/admix/rest/form.html.haml +0 -50
- data/app/views/admix/rest/index.html.haml +0 -3
- data/app/views/admix/rest/new.html.haml +0 -3
- data/app/views/admix/rest/show.html.haml +0 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1104df915a5f8b576192765e4455771056ab0238
|
4
|
+
data.tar.gz: d4f8d7f55e283fc5856bdcc8bc7d78d9b9cb7cac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1eaad3d160553605376755a46308425ce125ed9857afae5add78157e819f3e7af40050a954533baa07b6a3d1865e6aef85a4d7ceeb442661aff8afd98710bb0a
|
7
|
+
data.tar.gz: 247e21377d6311a4d7a4458f0d30b434d403f4667934a5384d8c2194d0f95b5747782bb5d2dcdb1f26f7fb05ae8e3d752b9ef8bf3f36c0387bd3fb79719021ee
|
@@ -15,12 +15,11 @@
|
|
15
15
|
#= require jquery.qtip.js
|
16
16
|
#= require jquery.globalmoney
|
17
17
|
#= require ckeditor/init
|
18
|
-
#= require jquery.meio.mask.min
|
19
18
|
#= require jquery.ui.addresspicker
|
20
|
-
|
21
19
|
#= require angular.min
|
22
20
|
#= require angular-ui.min
|
23
21
|
#= require gmaps
|
22
|
+
#= require inputs_masks
|
24
23
|
|
25
24
|
|
26
25
|
Backbone.emulateHTTP = true
|
@@ -54,12 +53,6 @@ $ ->
|
|
54
53
|
dateFormat: "dd/mm/yy"
|
55
54
|
altField: $(this).next()
|
56
55
|
|
57
|
-
$(".cell, .phone").livequery ->
|
58
|
-
$(@).setMask('(84) 9999-9999')
|
59
|
-
|
60
|
-
$(".cep").livequery ->
|
61
|
-
$(@).setMask('99999-999')
|
62
|
-
|
63
56
|
# window.admix = angular.module('admix', ['ui'])
|
64
57
|
# .config(["$httpProvider", function(provider) {
|
65
58
|
# provider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content');
|
@@ -1,5 +1,6 @@
|
|
1
1
|
.well
|
2
|
-
|
2
|
+
- if not ['new'].include? params[:action]
|
3
|
+
= link_to "#{t('admix.crud.new.link')} " + t("#{@collection_name}.#{@collection_name.singularize}"), new_resource_url, class: 'btn'
|
3
4
|
= link_to t('admix.crud.list.title', resources: t("#{@collection_name}.#{@collection_name}")), collection_url, class: 'btn'
|
4
5
|
- if not ['index', 'edit'].include? params[:action]
|
5
6
|
- if not resource.nil? and not resource.new_record?
|
data/lib/admix/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: admix
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.26.
|
4
|
+
version: 0.26.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sadjow Leão
|
@@ -31,42 +31,42 @@ dependencies:
|
|
31
31
|
requirements:
|
32
32
|
- - '='
|
33
33
|
- !ruby/object:Gem::Version
|
34
|
-
version: 0.26.
|
34
|
+
version: 0.26.2
|
35
35
|
type: :runtime
|
36
36
|
prerelease: false
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
38
38
|
requirements:
|
39
39
|
- - '='
|
40
40
|
- !ruby/object:Gem::Version
|
41
|
-
version: 0.26.
|
41
|
+
version: 0.26.2
|
42
42
|
- !ruby/object:Gem::Dependency
|
43
43
|
name: mix-rails-auth
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
45
45
|
requirements:
|
46
46
|
- - '='
|
47
47
|
- !ruby/object:Gem::Version
|
48
|
-
version: 0.26.
|
48
|
+
version: 0.26.2
|
49
49
|
type: :runtime
|
50
50
|
prerelease: false
|
51
51
|
version_requirements: !ruby/object:Gem::Requirement
|
52
52
|
requirements:
|
53
53
|
- - '='
|
54
54
|
- !ruby/object:Gem::Version
|
55
|
-
version: 0.26.
|
55
|
+
version: 0.26.2
|
56
56
|
- !ruby/object:Gem::Dependency
|
57
57
|
name: mix-rails-settings
|
58
58
|
requirement: !ruby/object:Gem::Requirement
|
59
59
|
requirements:
|
60
60
|
- - '='
|
61
61
|
- !ruby/object:Gem::Version
|
62
|
-
version: 0.26.
|
62
|
+
version: 0.26.2
|
63
63
|
type: :runtime
|
64
64
|
prerelease: false
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
66
66
|
requirements:
|
67
67
|
- - '='
|
68
68
|
- !ruby/object:Gem::Version
|
69
|
-
version: 0.26.
|
69
|
+
version: 0.26.2
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: inherited_resources
|
72
72
|
requirement: !ruby/object:Gem::Requirement
|
@@ -146,7 +146,6 @@ extensions: []
|
|
146
146
|
extra_rdoc_files: []
|
147
147
|
files:
|
148
148
|
- app/controllers/admix/registrations_controller.rb
|
149
|
-
- app/controllers/admix/rest_controller.rb
|
150
149
|
- app/controllers/admix/inherited_controller.rb
|
151
150
|
- app/controllers/admix/sessions_controller.rb
|
152
151
|
- app/controllers/admix/dashboard_controller.rb
|
@@ -1184,18 +1183,6 @@ files:
|
|
1184
1183
|
- app/helpers/admix_helper.rb
|
1185
1184
|
- app/mailers/admix_mailer.rb
|
1186
1185
|
- app/views/admix/dashboard/index.html.haml
|
1187
|
-
- app/views/admix/rest/_empty_grid.haml
|
1188
|
-
- app/views/admix/rest/_column_actions.haml
|
1189
|
-
- app/views/admix/rest/new.html.haml
|
1190
|
-
- app/views/admix/rest/_grid.haml
|
1191
|
-
- app/views/admix/rest/_grid_actions.haml
|
1192
|
-
- app/views/admix/rest/form.html.haml
|
1193
|
-
- app/views/admix/rest/edit.html.haml
|
1194
|
-
- app/views/admix/rest/index.html.haml
|
1195
|
-
- app/views/admix/rest/_actions.haml
|
1196
|
-
- app/views/admix/rest/show.html.haml
|
1197
|
-
- app/views/admix/rest/_grid_columns.haml
|
1198
|
-
- app/views/admix/rest/_form_config.haml
|
1199
1186
|
- app/views/admix/inherited/_empty_grid.haml
|
1200
1187
|
- app/views/admix/inherited/_column_actions.haml
|
1201
1188
|
- app/views/admix/inherited/new.html.haml
|
@@ -1,46 +0,0 @@
|
|
1
|
-
class Admix::RestController < Admix::AdmixController
|
2
|
-
|
3
|
-
inherit_resources
|
4
|
-
|
5
|
-
before_filter -> {
|
6
|
-
if defined?(parent_type)
|
7
|
-
breadcrumbs.add t("#{parent_type.to_s.gsub('_', '').pluralize}.#{parent_type.to_s.gsub('_', '').pluralize}") , polymorphic_path([:admix, parent_class])
|
8
|
-
breadcrumbs.add "#{parent.name}" , parent_url
|
9
|
-
end
|
10
|
-
}
|
11
|
-
|
12
|
-
before_filter -> { breadcrumbs.add t("#{collection_name}.#{collection_name}"), collection_url, :i18n => false }
|
13
|
-
before_filter -> { breadcrumbs.add "#{crumb_field}" , resource_url, :i18n => false } , except: [:index, :new, :create ]
|
14
|
-
before_filter -> { breadcrumbs.add t("admix.crud.new.title"), :i18n => false } , only: [:new ]
|
15
|
-
before_filter -> { @crumb_field = crumb_field } , only: [:edit ]
|
16
|
-
|
17
|
-
protected
|
18
|
-
|
19
|
-
def crumb_field
|
20
|
-
field_name = if resource.respond_to?(:name)
|
21
|
-
:name
|
22
|
-
elsif resource.respond_to?(:title)
|
23
|
-
:title
|
24
|
-
elsif resource.respond_to?(:email)
|
25
|
-
:email
|
26
|
-
else
|
27
|
-
raise "Implement crumb_field method in #{self}"
|
28
|
-
end
|
29
|
-
|
30
|
-
resource[field_name]
|
31
|
-
|
32
|
-
end
|
33
|
-
|
34
|
-
def load_grid
|
35
|
-
@grid = initialize_grid(resource_class)
|
36
|
-
end
|
37
|
-
|
38
|
-
def collection_name
|
39
|
-
@collection_name = resource_class.to_s.underscore.pluralize.gsub("::", "_")
|
40
|
-
end
|
41
|
-
|
42
|
-
def resource_name
|
43
|
-
resource_class.to_s.downcase
|
44
|
-
end
|
45
|
-
|
46
|
-
end
|
@@ -1,7 +0,0 @@
|
|
1
|
-
.well
|
2
|
-
= link_to "#{t('admix.crud.new.link')} " + t("#{@collection_name}.#{@collection_name.singularize}"), new_resource_url, class: 'btn'
|
3
|
-
= link_to t('admix.crud.list.title', resources: t("#{@collection_name}.#{@collection_name}")), collection_url, class: 'btn'
|
4
|
-
- if not ['index', 'edit'].include? params[:action]
|
5
|
-
- if not resource.nil? and not resource.new_record?
|
6
|
-
= link_edit(resource, t('admix.crud.edit.link'), 'btn-primary')
|
7
|
-
= link_destroy(resource, t('admix.crud.destroy.link'), 'btn-danger')
|
File without changes
|
@@ -1 +0,0 @@
|
|
1
|
-
= grid_actions_for(obj)
|
@@ -1,11 +0,0 @@
|
|
1
|
-
- if resource_class.column_names.include? 'name'
|
2
|
-
- grid.column name: input_label(:defaults, :name), attribute: 'name' do |obj|
|
3
|
-
- obj.name
|
4
|
-
- elsif resource_class.column_names.include? 'title'
|
5
|
-
- grid.column name: input_label(:defaults, :title), attribute: 'title' do |obj|
|
6
|
-
- obj.title
|
7
|
-
- elsif resource_class.column_names.include? 'email'
|
8
|
-
- grid.column name: input_label(:defaults, :email), attribute: 'email' do |obj|
|
9
|
-
- obj.email
|
10
|
-
|
11
|
-
- column_actions(grid)
|
@@ -1,50 +0,0 @@
|
|
1
|
-
- array_of_resources = [:admix]
|
2
|
-
- if defined? parent_type
|
3
|
-
- array_of_resources << parent_type
|
4
|
-
- array_of_resources << resource
|
5
|
-
|
6
|
-
= simple_form_for array_of_resources, :html => {:name => 'AdmixForm', :class => 'form-admix', 'ng-controller' => 'FormController' }, wrapper: :bootstrap do |f|
|
7
|
-
%h1 {{method}}
|
8
|
-
= render partial: 'form_config', locals: {f:f}
|
9
|
-
= f.error_notification
|
10
|
-
|
11
|
-
.row-fluid
|
12
|
-
.span7
|
13
|
-
.row-fluid
|
14
|
-
.span12
|
15
|
-
.tabbable.tabs-left
|
16
|
-
%ul#admix_form_tabs.nav.nav-tabs
|
17
|
-
- if content_for?(:nav_tabs)
|
18
|
-
= content_for(:nav_tabs)
|
19
|
-
- elsif @admix_tabs
|
20
|
-
- @admix_tabs.each do |tab|
|
21
|
-
= tab.header
|
22
|
-
.tab-content.well
|
23
|
-
- if content_for?(:tabs_content)
|
24
|
-
= content_for(:tabs_content)
|
25
|
-
- elsif @admix_tabs
|
26
|
-
- @admix_tabs.each do |tab|
|
27
|
-
.tab-pane{id: tab.tab_id, class: (tab.options[:first] ? 'active' : '')}
|
28
|
-
.span12
|
29
|
-
.row-fluid
|
30
|
-
= tab.content
|
31
|
-
.span4
|
32
|
-
%ul.nav.nav-list.well
|
33
|
-
%li
|
34
|
-
.div
|
35
|
-
= f.button :submit, class: 'btn-primary'
|
36
|
-
= link_to t('admix.crud.cancel'), collection_url, class: 'btn'
|
37
|
-
- if not resource.nil? and not resource.new_record?
|
38
|
-
= link_destroy(resource, t('admix.crud.destroy.link'), 'btn-danger')
|
39
|
-
- if content_for?(:form_options)
|
40
|
-
%li.nav-header Opções
|
41
|
-
%li
|
42
|
-
= content_for(:form_options)
|
43
|
-
|
44
|
-
|
45
|
-
= content_for(:after_inner_form)
|
46
|
-
= content_for(:after_form)
|
47
|
-
:coffeescript
|
48
|
-
$('#admix_form_tabs a').click (e) ->
|
49
|
-
e.preventDefault()
|
50
|
-
$(this).tab('show')
|