From dd2420b52dd03ff21020cd7748504c5b3adfbb71 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Fri, 24 Jul 2026 17:39:10 +0800 Subject: [PATCH] refactor: rename event_date fields to recruitment_date across recruitment_mod --- .../admin/recruitment_controller.rb | 8 ++++---- app/models/recruitment.rb | 6 +++--- app/models/recruitment_custom_title.rb | 2 +- .../admin/recruitment/_edit_sort.html.erb | 2 +- .../admin/recruitment/_export_excel.xlsx.axlsx | 4 ++-- app/views/admin/recruitment/_form.html.erb | 18 +++++++++--------- app/views/admin/recruitment/_index.html.erb | 2 +- .../admin/recruitment/excel_format.xlsx.axlsx | 2 +- app/views/admin/recruitment/settings.html.erb | 4 ++-- config/locales/zh_tw.yml | 8 ++++---- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/controllers/admin/recruitment_controller.rb b/app/controllers/admin/recruitment_controller.rb index 14bdd4e..7e7d0ac 100644 --- a/app/controllers/admin/recruitment_controller.rb +++ b/app/controllers/admin/recruitment_controller.rb @@ -31,16 +31,16 @@ class Admin::RecruitmentController < OrbitAdminController def edit_sort @setting = @recruitment_setting @recruitment = Recruitment.where(is_top: true).order_by({is_top: -1,sort_number: 1,postdate: -1, _id: -1}) - @table_fields = ['recruitment.table.sort_number','recruitment.table.title','recruitment.event_date','recruitment.start_date'] + @table_fields = ['recruitment.table.sort_number','recruitment.table.title','recruitment.recruitment_date','recruitment.start_date'] end def index Recruitment.remove_expired_status @tags = @module_app.tags - @table_fields = [:status, :category, :title, "recruitment.event_date", "recruitment.start_date", "recruitment.end_date", :last_modified] + @table_fields = [:status, :category, :title, "recruitment.recruitment_date", "recruitment.start_date", "recruitment.end_date", :last_modified] @current_user = current_user if params[:sort].blank? - params[:sort] = 'event_date' + params[:sort] = 'recruitment_date' params[:order] = 'desc' end if RecruitmentSetting.first.is_display_edit_only && !current_user.is_admin? && !current_user.is_manager?(@module_app) @@ -586,7 +586,7 @@ class Admin::RecruitmentController < OrbitAdminController def update_is_postdate_sort_first(setting) if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash OrbitHelper::SharedHash['recruitment_mod'][:is_postdate_sort_first] = setting.is_postdate_sort_first - feeds_time_field = (RecruitmentHelper.is_postdate_sort_first ? ['postdate', 'event_date'] : ['event_date', 'postdate']) + feeds_time_field = (RecruitmentHelper.is_postdate_sort_first ? ['postdate', 'recruitment_date'] : ['recruitment_date', 'postdate']) @module_app.feeds_time_field = feeds_time_field @module_app.save if defined?(Feeds) diff --git a/app/models/recruitment.rb b/app/models/recruitment.rb index 691b880..dea180f 100644 --- a/app/models/recruitment.rb +++ b/app/models/recruitment.rb @@ -47,7 +47,7 @@ class Recruitment end Week_day_trans = {:en=>["Sun","Mon","Tue","Wed","Thu","Fri","Sat"], :zh_tw=>["(日)","(一)","(二)","(三)","(四)","(五)","(六)"]} - field :event_date_use_default_setting, type: Boolean, default: true + field :recruitment_date_use_default_setting, type: Boolean, default: true field :including_day_of_the_week, type: Boolean, default: true field :including_time, type: Boolean, default: true field :hour_clock_24, type: Boolean, default: true @@ -78,8 +78,8 @@ class Recruitment field :create_user_id field :update_user_id field :public, :type => Boolean, :default => true - field :event_date , :type => DateTime, :default => Time.now - field :event_end_date , :type => DateTime + field :recruitment_date , :type => DateTime, :default => Time.now + field :recruitment_end_date , :type => DateTime field :postdate , :type => DateTime, :default => Time.now field :deadline , :type => DateTime field :rss2_sn diff --git a/app/models/recruitment_custom_title.rb b/app/models/recruitment_custom_title.rb index f6a4624..ebc562f 100644 --- a/app/models/recruitment_custom_title.rb +++ b/app/models/recruitment_custom_title.rb @@ -3,7 +3,7 @@ class RecruitmentCustomTitle include Mongoid::Timestamps field :key field :title, type: String, localize: true - KEYS = ['category', 'title', 'event_date', 'education_requirement', 'experience_requirement', 'skills_requirement', 'language', 'salary_info', 'notes', 'contact_info'] + KEYS = ['category', 'title', 'recruitment_date', 'education_requirement', 'experience_requirement', 'skills_requirement', 'language', 'salary_info', 'notes', 'contact_info'] def self.get_map KEYS.map do |k| s = self.where(key: k).first || self.create(key: k,title_translations: I18n.available_locales.map{|l| [l,I18n.with_locale(l){I18n.t("recruitment.#{k}")}]}.to_h) diff --git a/app/views/admin/recruitment/_edit_sort.html.erb b/app/views/admin/recruitment/_edit_sort.html.erb index 0c6b779..d3ce829 100644 --- a/app/views/admin/recruitment/_edit_sort.html.erb +++ b/app/views/admin/recruitment/_edit_sort.html.erb @@ -26,7 +26,7 @@ <%= ev.title.html_safe %> - <%= format_value ev.event_date %> + <%= format_value ev.recruitment_date %> <%= format_value ev.postdate %> diff --git a/app/views/admin/recruitment/_export_excel.xlsx.axlsx b/app/views/admin/recruitment/_export_excel.xlsx.axlsx index 49aac93..f3a72d6 100644 --- a/app/views/admin/recruitment/_export_excel.xlsx.axlsx +++ b/app/views/admin/recruitment/_export_excel.xlsx.axlsx @@ -38,7 +38,7 @@ wb.add_worksheet(name: "RecruitmentModule") do |sheet| end row2 << tags_str2 - row << t("recruitment.event_date") + row << t("recruitment.recruitment_date") row1 << "datetime" row2 << "Format: YYYY/MM/DD HH:mm, Example: 2015/12/10 15:20" @@ -212,7 +212,7 @@ wb.add_worksheet(name: "RecruitmentModule") do |sheet| t << tags.to_a.index(tag) end row << t.join(",") - row << (anns.event_date.strftime("%Y/%m/%d %H:%M") rescue "") + row << (anns.recruitment_date.strftime("%Y/%m/%d %H:%M") rescue "") row << (anns.postdate.strftime("%Y/%m/%d %H:%M") rescue "") row << (anns.deadline.strftime("%Y/%m/%d %H:%M") rescue "") row << (anns.is_top? ? 1 : 0) diff --git a/app/views/admin/recruitment/_form.html.erb b/app/views/admin/recruitment/_form.html.erb index c5689d0..ce16397 100644 --- a/app/views/admin/recruitment/_form.html.erb +++ b/app/views/admin/recruitment/_form.html.erb @@ -93,25 +93,25 @@
- +
- <%= f.datetime_picker :event_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %> + <%= f.datetime_picker :recruitment_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %>
- <%= f.check_box :event_date_use_default_setting, :id=>"event_date_use_default_setting" %> + <%= f.check_box :recruitment_date_use_default_setting, :id=>"recruitment_date_use_default_setting" %>
- +
- <%= f.datetime_picker :event_end_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %> + <%= f.datetime_picker :recruitment_end_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %>
-
- <%=t("recruitment.event_date_setting")%> +
+ <%=t("recruitment.recruitment_date_setting")%>
@@ -666,7 +666,7 @@ <% end %>