From 97df100c64dacc802d9c292b839960383d8c8d26 Mon Sep 17 00:00:00 2001 From: iCross Date: Mon, 27 May 2013 17:39:39 +0800 Subject: [PATCH] remove department --- .../ask/app/models/ask_question.rb | 3 +-- .../ask/front_end/ask_questions/index.html.erb | 16 ---------------- .../ask/config/locales/zh_tw.yml | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/vendor/built_in_modules/ask/app/models/ask_question.rb b/vendor/built_in_modules/ask/app/models/ask_question.rb index 13a5f939..13989acc 100644 --- a/vendor/built_in_modules/ask/app/models/ask_question.rb +++ b/vendor/built_in_modules/ask/app/models/ask_question.rb @@ -3,7 +3,6 @@ class AskQuestion include Mongoid::Timestamps include OrbitCoreLib::ObjectDisable - field :department, type: String field :name, type: String field :identity, type: String field :email, type: String @@ -12,7 +11,7 @@ class AskQuestion field :title, type: String field :content, type: String - validates_presence_of :department, :name, :identity, :email, :title, :content + validates_presence_of :name, :identity, :email, :title, :content belongs_to :ask_category has_one :ask_reply, dependent: :destroy diff --git a/vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb b/vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb index b4952536..e38359fe 100644 --- a/vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb +++ b/vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb @@ -1,22 +1,6 @@
<%= form_for @ask_question, url: panel_ask_front_end_ask_questions_path(standalone: true), remote: true, html: {class: 'form-horizontal'} do |f| %> -
-
- <%= f.select :department, options_for_select([ - ['文書組', '文書組'], - ['事務租', '事務租'], - ['保管組', '保管組'], - ['出納組', '出納組'], - ['采購組', '采購組'], - ['經營管理組', '經營管理組'], - ['駐警隊', '駐警隊'], - ['社科院總務分處', '社科院總務分處'], - ['醫學院總務分處', '醫學院總務分處'], - ['總務處秘書室', '總務處秘書室'], - ]) %> -
-
<%= f.label :ask_category_id, class: 'control-label required' %>
diff --git a/vendor/built_in_modules/ask/config/locales/zh_tw.yml b/vendor/built_in_modules/ask/config/locales/zh_tw.yml index 0fbd7434..c463cccd 100644 --- a/vendor/built_in_modules/ask/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/ask/config/locales/zh_tw.yml @@ -16,7 +16,6 @@ zh_tw: mongoid: attributes: ask_question: - department: 單位 ask_category_id: 諮詢類別 name: 姓名 identity: 身份