diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index fa79084f1..0a3ba76a0 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -722,6 +722,9 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1); } +#category_id, #module_app_id { + width: auto; +} [class^="icons-"] { display: inline-block; diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb index 339f7edee..28f99fa20 100644 --- a/app/controllers/orbit_backend_controller.rb +++ b/app/controllers/orbit_backend_controller.rb @@ -155,7 +155,7 @@ class OrbitBackendController< ApplicationController def get_viewable(object_class) - objects = get_objects(object_class) + objects = get_objects(object_class).order_by(:created_at, :desc) Kaminari.paginate_array(objects).page(params[:page]).per(10) end diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 1fbb8d488..a4516ee5b 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -39,7 +39,7 @@ zh_tw: submit: 送出 sure?: 您肯定嗎? update: 更新 - update: 更新失敗 + update_failed: 更新失敗 view: 檢視 view_count: 查看次數 yes_: "Yes" diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 420b01433..9cba6794e 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -137,6 +137,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController else @bulletin = Bulletin.new(params[:bulletin]) + @bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate @bulletin.create_user_id = current_user.id @bulletin.update_user_id = current_user.id @@ -245,6 +246,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController else @bulletin = Bulletin.find(params[:id]) + @bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate @bulletin.update_user_id = current_user.id diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index 052472510..c515dc656 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -15,7 +15,7 @@
<% if @bulletin.image %> - <%= image_tag @bulletin.image, :width=> "456", :height=>'700' rescue ''%> + <%= image_tag @bulletin.image rescue ''%> <% else %> <% end %> diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb index 46bd2f028..b725da6d1 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb @@ -136,6 +136,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController else @news_bulletin = NewsBulletin.new(params[:news_bulletin]) + @news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate @news_bulletin.create_user_id = current_user.id @news_bulletin.update_user_id = current_user.id @@ -244,6 +245,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController else @news_bulletin = NewsBulletin.find(params[:id]) + @news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate @news_bulletin.update_user_id = current_user.id diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb index 38c2db316..eb2a2d95f 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb @@ -15,11 +15,10 @@
<% if @news_bulletin.image %> - <%= image_tag @news_bulletin.image, :width=> "456", :height=>'700' rescue ''%> + <%= image_tag @news_bulletin.image rescue ''%> <% else %> <% end %> -