Changes for dat and time format
Impression bug when some i18n missing in impressionable object JS bug in ad_banner edit title
This commit is contained in:
1 parent
e1bd5d8c8d
commit
4d33c7a56d
24 files changed
+57
-46
No files matched your search
@@ -40,11 +40,11 @@ $(".nav-tabs").find(".icons-pencil").click(function(){
|
||||
data: { body: content_holder.html() },
|
||||
success: function(json) {
|
||||
$(selector).attr("contenteditable",false)
|
||||
alert("<%= I18n.t("admin.contenteditable.update_done") %>");
|
||||
alert("<%= I18n.t('admin.contenteditable.update_done') %>");
|
||||
//content_holder.effect('highlight', {'color': '#0f0'}, 3000);
|
||||
},
|
||||
error: function() {
|
||||
alert("<%= I18n.t("admin.contenteditable.update_failed") %>");
|
||||
alert("<%= I18n.t('admin.contenteditable.update_failed') %>");
|
||||
//content_holder.effect('highlight', {'color': '#f00'}, 3000);
|
||||
content_holder.html(content);
|
||||
}
|
||||
|
||||
@@ -204,4 +204,12 @@ module ApplicationHelper
|
||||
is_manager? || is_admin?
|
||||
end
|
||||
|
||||
def display_date_time(object)
|
||||
object.strftime("%Y-%m-%d %H:%M:%S")
|
||||
end
|
||||
|
||||
def display_date(object)
|
||||
object.strftime("%Y-%m-%d")
|
||||
end
|
||||
|
||||
end
|
||||
+2
-2
@@ -34,10 +34,10 @@ class Asset
|
||||
protected
|
||||
|
||||
def set_key
|
||||
if title.new_record?
|
||||
if title && title.new_record?
|
||||
title.key = 'title'
|
||||
end
|
||||
if description.new_record?
|
||||
if description && description.new_record?
|
||||
description.key = 'description'
|
||||
end
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user