it-logica-application-backbone 1.2.18 → 1.2.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/VERSION +1 -1
  2. data/app/views/helpers/_build_table_filter.html.erb +2 -2
  3. data/app/views/helpers/editable_table/_build_table_ajax_callback_code.html.erb +2 -2
  4. data/it-logica-application-backbone.gemspec +1 -1
  5. data/lib/controller_mixins/csv_instance_methods.rb +32 -4
  6. metadata +14 -14
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.2.18
1
+ 1.2.19
data/app/views/helpers/_build_table_filter.html.erb CHANGED
@@ -32,10 +32,10 @@
32
32
  FilterChangeMarker.mark_active_filters('<%= settings[:form_id] %>');
33
33
 
34
34
  $("#<%= settings[:form_id] %>")
35
- .live("ajax:beforeSend", function (evt, xhr, settings) {
35
+ .bind("ajax:beforeSend", function (evt, xhr, settings) {
36
36
  ladas_loading_show();
37
37
  })
38
- .live("ajax:complete", function (evt, xhr, status) {
38
+ .bind("ajax:complete", function (evt, xhr, status) {
39
39
  var parsed_response = jQuery.parseJSON(xhr.responseText);
40
40
 
41
41
  //console.log(xhr.responseText)
data/app/views/helpers/editable_table/_build_table_ajax_callback_code.html.erb CHANGED
@@ -17,10 +17,10 @@
17
17
 
18
18
 
19
19
  $("#<%= settings[:form_id] %>")
20
- .live("ajax:beforeSend", function (evt, xhr, settings) {
20
+ .bind("ajax:beforeSend", function (evt, xhr, settings) {
21
21
  ladas_loading_show();
22
22
  })
23
- .live("ajax:complete", function (evt, xhr, status) {
23
+ .bind("ajax:complete", function (evt, xhr, status) {
24
24
  var parsed_response = jQuery.parseJSON(xhr.responseText);
25
25
 
26
26
 
data/it-logica-application-backbone.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "it-logica-application-backbone"
8
- s.version = "1.2.18"
8
+ s.version = "1.2.19"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ladas"]
data/lib/controller_mixins/csv_instance_methods.rb CHANGED
@@ -56,6 +56,15 @@ module ControllerMixins
56
56
  def make_import_csv(model_class, import_settings = nil)
57
57
  if request.post? && params[:file].present?
58
58
  infile = params[:file].read
59
+
60
+ # whether it should be updated is decided by user by checkbox
61
+ update_existing = params[:update_existing]
62
+ unique_attribute_for_update = import_settings[:unique_attribute_for_update]
63
+
64
+ # additional row data will be added to each row
65
+ additional_row_data = import_settings[:additional_row_data]
66
+
67
+ @successful_updates = 0
59
68
  @successful_creates = 0
60
69
  @errors = []
61
70
  @label_header = []
@@ -79,12 +88,31 @@ module ControllerMixins
79
88
  end
80
89
 
81
90
  row_data = model_class.build_record_from_csv(row, header, white_list)
82
-
83
-
84
- row_obj = model_class.new(row_data)
91
+ # merging with additional data if there are some
92
+ row_data.merge!(additional_row_data) unless additional_row_data.blank?
93
+
94
+
95
+ import_operation = :create
96
+ if update_existing
97
+ # updating is allowed
98
+ if (row_obj = model_class.where(unique_attribute_for_update => row_data[unique_attribute_for_update]).first)
99
+ import_operation = :update
100
+ row_obj.assign_attributes(row_data)
101
+ else
102
+ row_obj = model_class.new(row_data)
103
+ end
104
+ else
105
+ row_obj = model_class.new(row_data)
106
+ end
85
107
 
86
108
  if row_obj.save
87
- @successful_creates += 1
109
+ case import_operation
110
+ when :create
111
+ @successful_creates += 1
112
+ when :update
113
+ @successful_updates += 1
114
+ end
115
+
88
116
  else
89
117
  error_message = ""
90
118
  row_obj.errors.full_messages.each do |msg|
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: it-logica-application-backbone
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.18
4
+ version: 1.2.19
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-11-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: htmlentities
16
- requirement: &75648380 !ruby/object:Gem::Requirement
16
+ requirement: &83551050 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *75648380
24
+ version_requirements: *83551050
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &75648080 !ruby/object:Gem::Requirement
27
+ requirement: &83550730 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *75648080
35
+ version_requirements: *83550730
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &75647720 !ruby/object:Gem::Requirement
38
+ requirement: &83550350 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.12'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *75647720
46
+ version_requirements: *83550350
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &75647320 !ruby/object:Gem::Requirement
49
+ requirement: &83549970 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.1.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *75647320
57
+ version_requirements: *83549970
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &75646850 !ruby/object:Gem::Requirement
60
+ requirement: &83549450 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.8.4
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *75646850
68
+ version_requirements: *83549450
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
- requirement: &75646510 !ruby/object:Gem::Requirement
71
+ requirement: &83549130 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *75646510
79
+ version_requirements: *83549130
80
80
  description: longer description of your gem
81
81
  email: ladislav.smola@it-logica.cz
82
82
  executables: []
@@ -618,7 +618,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
618
618
  version: '0'
619
619
  segments:
620
620
  - 0
621
- hash: 381236147
621
+ hash: -1063369937
622
622
  required_rubygems_version: !ruby/object:Gem::Requirement
623
623
  none: false
624
624
  requirements: