diff --git a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb index ce233ea72..9ed18e048 100644 --- a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb +++ b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb @@ -32,7 +32,6 @@ class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController send_request(dns, @ask_question, @ask_reply) end unless params[:school].nil? - redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success') end @@ -75,7 +74,7 @@ class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController new_status = "轉介其他單位" + "(" + response.code + ")" current_reply.update_attributes(status: new_status) else - new_status = "轉介其他單位" + "(" + "succes!" + ")" + new_status = "轉介其他單位" + "(" + "success!" + ")" current_reply.update_attributes(status: new_status) end end diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb index 90825c6d9..f22ed63ce 100644 --- a/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb +++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb @@ -2,7 +2,18 @@ $(document).ready(function() { if ($("#ask_reply_status").val() == '轉介其他單位') { $('.dept_options').show(); } + $("#ask_reply_status").change(function() { + + var local_host = "<%= request.host %>:<%= request.port %>"; + + $('input[type=checkbox]').each(function() { + if ($(this).val() == local_host) { + $(this).addClass("hide"); + $(this).next().addClass("hide"); + } + }); + $('.dept_options').slideUp(); if ($(this).find('option:selected').attr('value') == '轉介其他單位') { $('.dept_options').slideDown(); @@ -16,6 +27,9 @@ $(document).ready(function() { .dept_options { display: none; } +.hide { + display: none; +}