Merge branch 'master' into fancy-user-page
This commit is contained in:
commit
35fba66b39
3 changed files with 9 additions and 1 deletions
|
@ -34,6 +34,12 @@ ready = function() {
|
||||||
render: function(data, type, full, meta) {
|
render: function(data, type, full, meta) {
|
||||||
return (data/100).toFixed(2);
|
return (data/100).toFixed(2);
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
targets: 4,
|
||||||
|
render: function(data, type, full, meta) {
|
||||||
|
return new Option(data).innerHTML
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
class DataTable
|
class DataTable
|
||||||
|
include ActionView::Helpers::JavaScriptHelper
|
||||||
|
include ERB::Util
|
||||||
def initialize user, params
|
def initialize user, params
|
||||||
@user = user
|
@user = user
|
||||||
@params = sanitize_params(params)
|
@params = sanitize_params(params)
|
||||||
|
|
|
@ -14,7 +14,7 @@ module Tab
|
||||||
|
|
||||||
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
|
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
|
||||||
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
|
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
|
||||||
# config.time_zone = 'Central Time (US & Canada)'
|
config.time_zone = 'Brussels'
|
||||||
|
|
||||||
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
|
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
|
||||||
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
|
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
|
||||||
|
|
Loading…
Reference in a new issue