rademade_admin 0.1.1 → 0.1.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/rademade_admin.coffee +1 -0
- data/app/assets/javascripts/rademade_admin/app/common/location.coffee.erb +4 -1
- data/app/assets/javascripts/rademade_admin/app/common/uploader.coffee +1 -0
- data/app/assets/javascripts/rademade_admin/app/form-popup/view.coffee +3 -4
- data/app/assets/javascripts/rademade_admin/settings/ajax-csrf.coffee +4 -0
- data/app/assets/stylesheets/rademade_admin/lib/uploader.sass +7 -6
- data/app/cells/menu/sub_item.slim +1 -1
- data/app/controllers/rademade_admin/abstract_controller.rb +2 -0
- data/app/controllers/rademade_admin/model_controller.rb +17 -18
- data/app/helpers/rademade_admin/uri_helper.rb +5 -1
- data/app/inputs/rademade_admin/date_time_input.rb +1 -1
- data/app/inputs/rademade_admin/file_input.rb +1 -1
- data/app/inputs/rademade_admin/location_input.rb +1 -1
- data/app/inputs/rademade_admin/related_select_input.rb +1 -1
- data/app/services/saver.rb +2 -11
- data/lib/rademade_admin/version.rb +1 -1
- metadata +7 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e967c4945eda7534ef2e9ed32ae11b9686e16dc5
|
4
|
+
data.tar.gz: 68134738ae0f819c71c11abde50944e0b70d1da9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 93b797e63ff62a8c46185834188b9108e88e5c8a0a2317e114c021a83535c9b9fa61d012846b0386e5f7cd1e0b869dc8330117aad65a76e1c012d818eb35587c
|
7
|
+
data.tar.gz: c745f46bed20435c396c68d6be3dd3c09d4c4c5493ee4eb603cec0686f1f52efaf8a6da8b7d2feedab2d90329f70e0991b9947e6a36b88abfdaacb7849838f11
|
@@ -36,6 +36,7 @@
|
|
36
36
|
#= require underscore/underscore
|
37
37
|
#= require backbone/backbone
|
38
38
|
#= require_tree ./rademade_admin/library
|
39
|
+
#= require_tree ./rademade_admin/settings
|
39
40
|
#= require_tree ./rademade_admin/form
|
40
41
|
#= require_tree ./rademade_admin/app
|
41
42
|
#= require_tree ./rademade_admin
|
@@ -44,7 +44,10 @@ class @Location extends Backbone.View
|
|
44
44
|
|
45
45
|
@initAll : () ->
|
46
46
|
$('.location').each () ->
|
47
|
-
|
47
|
+
$location = $(this)
|
48
|
+
unless $location.data('initialized')
|
49
|
+
Location.init $location
|
50
|
+
$location.data('initialized', true)
|
48
51
|
|
49
52
|
$ ->
|
50
53
|
$(document).on('page:load ready init-plugins', Location.initAll)
|
@@ -65,6 +65,7 @@ class @Uploader extends Backbone.View
|
|
65
65
|
_getUploaderData : () ->
|
66
66
|
uploaderData = _.pick(@$uploader.data(), 'id', 'saved', 'model', 'column', 'uploader')
|
67
67
|
uploaderData.path = @$el.find('.form-input[type="hidden"]').val()
|
68
|
+
uploaderData.authenticity_token = encodeURI($('meta[name="csrf-token"]').attr('content'))
|
68
69
|
uploaderData
|
69
70
|
|
70
71
|
_setUploadProgress : (progress) =>
|
@@ -26,11 +26,10 @@ class @FormPopup.View extends Backbone.View
|
|
26
26
|
@$el.remove()
|
27
27
|
|
28
28
|
renderFromUrl : (url) ->
|
29
|
-
|
30
|
-
@$el.html html
|
31
|
-
@_updatePosition()
|
29
|
+
@$el.load url, =>
|
32
30
|
@delegateEvents()
|
33
31
|
@_init()
|
32
|
+
@show();
|
34
33
|
|
35
34
|
render : () ->
|
36
35
|
@renderFromUrl @model.get('edit_url')
|
@@ -61,4 +60,4 @@ class @FormPopup.View extends Backbone.View
|
|
61
60
|
popupView = new FormPopup.View
|
62
61
|
model : model
|
63
62
|
popupView.render()
|
64
|
-
popupView
|
63
|
+
popupView
|
@@ -51,16 +51,17 @@
|
|
51
51
|
margin: 10px 10px 0 0
|
52
52
|
|
53
53
|
.upload-progress-wrapper
|
54
|
+
position: relative
|
55
|
+
top: -5px
|
54
56
|
display: none
|
55
57
|
float: right
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
border
|
60
|
-
+border-radius(11px)
|
58
|
+
width: 100%
|
59
|
+
height: 5px
|
60
|
+
overflow: hidden
|
61
|
+
+border-radius(5px)
|
61
62
|
|
62
63
|
.upload-progress
|
63
64
|
height: 100%
|
64
65
|
width: 0
|
65
66
|
background: #00c83e
|
66
|
-
+border-radius(
|
67
|
+
+border-radius(5px)
|
@@ -8,6 +8,8 @@ module RademadeAdmin
|
|
8
8
|
layout 'rademade_admin'
|
9
9
|
|
10
10
|
before_action :init_user, :init_template_service, :require_login, :root_breadcrumbs
|
11
|
+
|
12
|
+
attr_reader :current_user
|
11
13
|
|
12
14
|
rescue_from ::CanCan::AccessDenied do |exception|
|
13
15
|
redirect_to root_url, :alert => exception.message
|
@@ -7,6 +7,10 @@ module RademadeAdmin
|
|
7
7
|
include RademadeAdmin::InstanceOptions
|
8
8
|
include RademadeAdmin::Templates
|
9
9
|
include RademadeAdmin::Notifier
|
10
|
+
|
11
|
+
helper ::RademadeAdmin::FieldHelper
|
12
|
+
helper ::RademadeAdmin::FormHelper
|
13
|
+
helper ::RademadeAdmin::UriHelper
|
10
14
|
|
11
15
|
before_filter :load_options, :additional_options
|
12
16
|
before_filter :sortable_service, :only => [:index]
|
@@ -15,25 +19,20 @@ module RademadeAdmin
|
|
15
19
|
authorize! :create, model_class
|
16
20
|
saver = RademadeAdmin::Saver.new(model_info, params)
|
17
21
|
saver.create_model
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
else
|
23
|
-
render_errors saver.errors
|
24
|
-
end
|
22
|
+
saver.save_data
|
23
|
+
success_insert( saver.item )
|
24
|
+
rescue Exception => e
|
25
|
+
render_errors e.record.errors
|
25
26
|
end
|
26
27
|
|
27
28
|
def update
|
28
29
|
authorize! :update, model_class
|
29
30
|
saver = RademadeAdmin::Saver.new(model_info, params)
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
render_errors saver.errors
|
36
|
-
end
|
31
|
+
saver.find_model
|
32
|
+
saver.save_data
|
33
|
+
success_update( saver.item )
|
34
|
+
rescue Exception => e
|
35
|
+
render_errors e.record.errors
|
37
36
|
end
|
38
37
|
|
39
38
|
def destroy
|
@@ -97,11 +96,12 @@ module RademadeAdmin
|
|
97
96
|
relation_service = RademadeAdmin::RelationService.new
|
98
97
|
@related_model_info = relation_service.related_model_info(model_info, params[:relation])
|
99
98
|
|
100
|
-
@item = model.find(params
|
101
|
-
|
99
|
+
@item = model.find(params[:id])
|
100
|
+
search_params = params.except(:id)
|
101
|
+
conditions = Search::Conditions::RelatedList.new(@item, search_params, @related_model_info.data_items)
|
102
102
|
@items = Search::Searcher.new(@related_model_info).search(conditions)
|
103
103
|
|
104
|
-
@sortable_service = RademadeAdmin::SortableService.new(@related_model_info,
|
104
|
+
@sortable_service = RademadeAdmin::SortableService.new(@related_model_info, search_params)
|
105
105
|
|
106
106
|
respond_to do |format|
|
107
107
|
format.html {
|
@@ -163,6 +163,5 @@ module RademadeAdmin
|
|
163
163
|
def additional_options
|
164
164
|
MenuCell.current_model = model
|
165
165
|
end
|
166
|
-
|
167
166
|
end
|
168
167
|
end
|
@@ -87,7 +87,11 @@ module RademadeAdmin::UriHelper
|
|
87
87
|
begin
|
88
88
|
Rails.application.routes.url_helpers.url_for(opts)
|
89
89
|
rescue
|
90
|
-
|
90
|
+
begin
|
91
|
+
RademadeAdmin::Engine.routes.url_helpers.url_for(opts)
|
92
|
+
rescue
|
93
|
+
nil
|
94
|
+
end
|
91
95
|
end
|
92
96
|
end
|
93
97
|
|
@@ -2,7 +2,7 @@
|
|
2
2
|
module RademadeAdmin
|
3
3
|
class DateTimeInput < SimpleForm::Inputs::DateTimeInput
|
4
4
|
|
5
|
-
def input
|
5
|
+
def input(wrapper_options = {})
|
6
6
|
@builder.text_field(attribute_name, input_html_options.merge({
|
7
7
|
:data => { 'date-time-picker' => '' },
|
8
8
|
:value => object.send(attribute_name).try(:strftime, '%d.%m.%Y %R')
|
@@ -9,7 +9,7 @@ module RademadeAdmin
|
|
9
9
|
include ::RademadeAdmin::Input::RelatedSelectInput::ModelData
|
10
10
|
include ::RademadeAdmin::Input::RelatedSelectInput::RelatedList
|
11
11
|
|
12
|
-
def input
|
12
|
+
def input(wrapper_options = {})
|
13
13
|
template.content_tag(
|
14
14
|
:div,
|
15
15
|
RademadeAdmin::HtmlBuffer.new([select_ui_html, add_button_html]),
|
data/app/services/saver.rb
CHANGED
@@ -17,27 +17,18 @@ module RademadeAdmin
|
|
17
17
|
@item = @model_info.model.new
|
18
18
|
end
|
19
19
|
|
20
|
-
def
|
20
|
+
def find_model
|
21
21
|
@item = @model_info.model.find(@params[:id])
|
22
|
-
save_model
|
23
22
|
end
|
24
23
|
|
25
|
-
def
|
24
|
+
def save_data
|
26
25
|
item.assign_attributes simple_field_params
|
27
26
|
save_localizable_fields
|
28
|
-
item.save
|
29
|
-
end
|
30
|
-
|
31
|
-
def save_aggregated_data
|
32
27
|
save_model_relations
|
33
28
|
save_model_uploads
|
34
29
|
item.save!
|
35
30
|
end
|
36
31
|
|
37
|
-
def errors
|
38
|
-
item.errors
|
39
|
-
end
|
40
|
-
|
41
32
|
private
|
42
33
|
|
43
34
|
def save_localizable_fields
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rademade_admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Vladislav Melanitskiy
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2014-12-
|
13
|
+
date: 2014-12-07 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rails
|
@@ -154,16 +154,16 @@ dependencies:
|
|
154
154
|
name: i18n-js
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
|
-
- - "
|
157
|
+
- - ">="
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: '
|
159
|
+
version: '0'
|
160
160
|
type: :runtime
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
|
-
- - "
|
164
|
+
- - ">="
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: '
|
166
|
+
version: '0'
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: ejs
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -387,6 +387,7 @@ files:
|
|
387
387
|
- app/assets/javascripts/rademade_admin/library/ckeditor/config.js
|
388
388
|
- app/assets/javascripts/rademade_admin/library/jquery/jquery.tablednd.js
|
389
389
|
- app/assets/javascripts/rademade_admin/library/notifier.custom.min.js
|
390
|
+
- app/assets/javascripts/rademade_admin/settings/ajax-csrf.coffee
|
390
391
|
- app/assets/stylesheets/edit.css
|
391
392
|
- app/assets/stylesheets/rademade_admin.sass.erb
|
392
393
|
- app/assets/stylesheets/rademade_admin/base/main.sass
|