rich_table_component 0.0.22 → 0.0.24

Sign up to get free protection for your applications and to get access to all the features.
@@ -192,7 +192,7 @@ module ComponentHelper
192
192
  end
193
193
 
194
194
  def row_number local_var_assignments
195
- counter = local_var_assignments["#{local_var_assignments[:rtc_partial]}_counter".to_sym].presence || 0
195
+ counter = local_var_assignments["#{local_var_assignments[:rtc_partial].split('/').last}_counter".to_sym].presence || 0
196
196
  offset = local_var_assignments[:offset]
197
197
  result = '<td class="numeric rtc_row_number">'
198
198
  if offset
@@ -226,6 +226,22 @@ module ComponentHelper
226
226
  result.html_safe
227
227
  end
228
228
 
229
+ def error_message_list errors
230
+ result = ""
231
+ if errors.present?
232
+ result += ' <div class="alert alert-error">'
233
+ result += ' <ul>'
234
+ errors.each do |k, v|
235
+ result += ' <li>'
236
+ result += t(k.to_s.split('.').join('_')) + ' ' + v
237
+ result += ' </li>'
238
+ end
239
+ result += ' </ul>'
240
+ result += ' </div>'
241
+ end
242
+ result.html_safe
243
+ end
244
+
229
245
  end
230
246
 
231
247
 
@@ -1,3 +1,3 @@
1
1
  module RichTableComponent
2
- VERSION = "0.0.22"
2
+ VERSION = "0.0.24"
3
3
  end
@@ -188,9 +188,9 @@ module RichTableComponent
188
188
  old_since = splitter_time[2].eql?('old') ? "#{splitter_time[1]}(curdate()) - " : ""
189
189
 
190
190
  if old_since.eql?("") && splitter_time[1].eql?('month')
191
- group_db = "(concat(year(#{group_attr}), '/', LPAD(month(#{group_attr}), 2, '0') ))"
191
+ group_db = "(concat(year(#{recapitulation_model.table_name}.#{group_attr}), '/', LPAD(month(#{recapitulation_model.table_name}.#{group_attr}), 2, '0') ))"
192
192
  else
193
- group_db = "(#{old_since}#{splitter_time[1]}(#{group_attr}))"
193
+ group_db = "(#{old_since}#{splitter_time[1]}(#{recapitulation_model.table_name}.#{group_attr}))"
194
194
  end
195
195
 
196
196
  if splitter_time[3].presence
@@ -198,7 +198,7 @@ module RichTableComponent
198
198
  end
199
199
  when :datetime
200
200
  old_since = splitter_time[2].eql?('old') ? "{splitter_time[1]}(curdate()) - " : ""
201
- group_db = "(#{old_since}#{splitter_time[1]}(#{group_attr}))"
201
+ group_db = "(#{old_since}#{splitter_time[1]}(#{recapitulation_model.table_name}.#{group_attr}))"
202
202
  else
203
203
  end
204
204
  end
@@ -688,7 +688,7 @@ var initManualPopover = function(){
688
688
  // $('body').popover({
689
689
  // selector: '[rel=popover], [rel=popover nofollow]'
690
690
  // });
691
- $("[rel=popover]").popover({ trigger: 'manual' }).hover(function(e){
691
+ $("[rel=popover]").popover({ trigger: 'manual', html: 'true' }).hover(function(e){
692
692
  $("[rel=popover]").not(this).popover('hide');
693
693
  $(this).popover('show');
694
694
  e.preventDefault();
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rich_table_component
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.22
4
+ version: 0.0.24
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-03-20 00:00:00.000000000 Z
12
+ date: 2013-05-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass-rails
@@ -483,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
483
483
  version: '0'
484
484
  requirements: []
485
485
  rubyforge_project:
486
- rubygems_version: 1.8.23
486
+ rubygems_version: 1.8.25
487
487
  signing_key:
488
488
  specification_version: 3
489
489
  summary: Just what the description said