From 88c8ca68d0c30e618acdbf1c54c492e9b930aca5 Mon Sep 17 00:00:00 2001
From: Bernie Chiu <bernie_chiu@hotmail.com>
Date: Tue, 1 Oct 2013 16:09:43 +0800
Subject: [PATCH] Add ask fail message and success redirect fix

---
 .../ask/front_end/ask_questions_controller.rb   | 17 ++++++++++++-----
 .../ask/front_end/ask_questions/create.js.erb   |  2 +-
 .../ask/front_end/ask_questions/index.html.erb  |  3 +--
 .../ask/front_end/ask_questions/index.js.erb    |  1 +
 .../ask/front_end/ask_questions/sorry.html.erb  |  1 +
 .../ask_new/config/locales/en.yml               |  1 +
 .../ask_new/config/locales/zh_tw.yml            |  1 +
 .../built_in_modules/ask_new/config/routes.rb   |  1 +
 8 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.js.erb
 create mode 100644 vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/sorry.html.erb

diff --git a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
index 5de179f37..e1b65fba3 100644
--- a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
+++ b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
@@ -14,18 +14,22 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
   def create
     @ask_question = AskQuestion.new(params[:ask_question])
     if gotcha_valid? && @ask_question.save
-     @acknowledgement = AskAcknowledgement.last
+      @acknowledgement = AskAcknowledgement.last
       @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
-      #@ask_question.save
-      redirect_to root_path
+
       AskAdmin.all.each do |ask_admin|
         AskMailer.notice(ask_admin, @ask_question).deliver
         Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
       end
- #      redirect_to panel_ask_front_end_thank_you_path
+
+      # Render to create.js.erb
       respond_to do |format|
         format.js
-       # format.js { render :thank_you, notice: 'Your question has been successfully sent.' }
+      end
+    else
+      # Render to index.js.erb
+      respond_to do |format|
+        format.js { render :index }
       end
     end
   end
@@ -43,4 +47,7 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
     end
     @item = Page.find(params[:page_id]) rescue nil
   end
+
+  def sorry
+  end
 end
diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/create.js.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/create.js.erb
index b9e03a590..a1951909d 100644
--- a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/create.js.erb
+++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/create.js.erb
@@ -1 +1 @@
-window.location.href= "<%= panel_ask_front_end_thank_you_path %>"
+window.location.href = "<%= panel_ask_front_end_thank_you_path %>";
diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb
index c40d397bb..349da3775 100644
--- a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb
+++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb
@@ -22,8 +22,7 @@ $(document).ready(function(){
     }).bind("ajaxError", function() {
         $(this).hide();
     });
- 
-     });
+});
 </script>
 
 <div id="spinner" class="spinner" style="display:none;">
diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.js.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.js.erb
new file mode 100644
index 000000000..bc272ab14
--- /dev/null
+++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.js.erb
@@ -0,0 +1 @@
+window.location.href = "<%= panel_ask_front_end_sorry_path %>";
\ No newline at end of file
diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/sorry.html.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/sorry.html.erb
new file mode 100644
index 000000000..674de72f8
--- /dev/null
+++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/sorry.html.erb
@@ -0,0 +1 @@
+<h3><%= t(:ask_fail, :scope => :ask) %> !</h3>
\ No newline at end of file
diff --git a/vendor/built_in_modules/ask_new/config/locales/en.yml b/vendor/built_in_modules/ask_new/config/locales/en.yml
index a4aeacae6..dcde262a0 100644
--- a/vendor/built_in_modules/ask_new/config/locales/en.yml
+++ b/vendor/built_in_modules/ask_new/config/locales/en.yml
@@ -1,5 +1,6 @@
 en:
   ask:
+    ask_fail: Something went wrong
     ask: Ask
     export: Export
     reply: Reply
diff --git a/vendor/built_in_modules/ask_new/config/locales/zh_tw.yml b/vendor/built_in_modules/ask_new/config/locales/zh_tw.yml
index 0b8109b11..452dbc407 100644
--- a/vendor/built_in_modules/ask_new/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/ask_new/config/locales/zh_tw.yml
@@ -3,6 +3,7 @@ zh_tw:
     errors:
       verification_failed: 驗證碼錯誤
   ask:
+    ask_fail: 寄送失敗
     ask: 發問
     export: 匯出
     reply: 回覆
diff --git a/vendor/built_in_modules/ask_new/config/routes.rb b/vendor/built_in_modules/ask_new/config/routes.rb
index cf7d5fe31..0e44b4693 100644
--- a/vendor/built_in_modules/ask_new/config/routes.rb
+++ b/vendor/built_in_modules/ask_new/config/routes.rb
@@ -22,6 +22,7 @@ Rails.application.routes.draw do
 
       namespace :front_end do
         match "ask_questions/thank_you" => "ask_questions#thank_you", :as => 'thank_you'
+        match "ask_questions/sorry" => "ask_questions#sorry", :as => 'sorry' 
         resources :ask_questions
       end
     end