From 78f412e50ccb9cba5356a808b524018cc92862e8 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Mon, 22 Jan 2018 17:28:14 +0800
Subject: [PATCH] fix for next and save employee portfolio

---
 app/controllers/recruitments_controller.rb             |  4 ++--
 app/views/recruitments/employee_portfolio.html.erb     | 10 ++++++----
 .../recruitments/employee_recommendation.html.erb      |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/recruitments_controller.rb b/app/controllers/recruitments_controller.rb
index 97a6d56..ef16364 100644
--- a/app/controllers/recruitments_controller.rb
+++ b/app/controllers/recruitments_controller.rb
@@ -467,13 +467,13 @@ class RecruitmentsController < PseudoSessionController
     if @profile.is_employer?
       redirect_to mydashboard_path
     elsif @profile.is_employee?
-      if params[:commit] == "Next" 
+      if params[:commit] == "Next" || params[:commit] == "下一個"
         if params[:step] == "step3"
           redirect_to employee_experience_path
         elsif params[:step] == "step1"
           redirect_to employee_academics_path
         end
-      elsif params[:commit] == "Save"
+      elsif params[:commit] == "Save" || params[:commit] == "儲存"
         redirect_to mydashboard_path
       end
     end
diff --git a/app/views/recruitments/employee_portfolio.html.erb b/app/views/recruitments/employee_portfolio.html.erb
index 66190e2..a13acf8 100644
--- a/app/views/recruitments/employee_portfolio.html.erb
+++ b/app/views/recruitments/employee_portfolio.html.erb
@@ -180,9 +180,11 @@
 </div>
 <script type="text/javascript">
   $(function() {
-     // $("#portfolioForm").submit(function() {
-     //    $(this).find(":input").filter(function(){ return !this.value; }).attr("disabled", "disabled");
-     //    return true; // ensure form still submits
-     //  });
+     $("#portfolioForm").submit(function() {
+        $(this).find(":input").not("textarea.ckeditor").filter(function(){ 
+        	return !this.value;
+        }).attr("disabled", "disabled");
+        return true; // ensure form still submits
+      });
   });
 </script>
\ No newline at end of file
diff --git a/app/views/recruitments/employee_recommendation.html.erb b/app/views/recruitments/employee_recommendation.html.erb
index 4a5d519..4ae785f 100644
--- a/app/views/recruitments/employee_recommendation.html.erb
+++ b/app/views/recruitments/employee_recommendation.html.erb
@@ -91,7 +91,7 @@
       </div>
       <div class="form-group">
         <div class="col-sm-offset-2 col-sm-10">
-          <a data-method="delete" data-confirm="Are you sure?" href="/recruit/<%= rec.id.to_s %>/delete_employee_recommendation" class="btn btn-danger"><%= t("recruitment.delete") %></a>
+          <a data-method="delete" data-confirm="Are you sure?" href="/recruit/<%= rec.id.to_s %>/delete_employee_recommendation" class="btn btn-danger"><%= t("delete_") %></a>
         </div>
       </div>
     </div>