diff --git a/app/controllers/recruitments_controller.rb b/app/controllers/recruitments_controller.rb index 765a4d1..97a6d56 100644 --- a/app/controllers/recruitments_controller.rb +++ b/app/controllers/recruitments_controller.rb @@ -63,7 +63,8 @@ class RecruitmentsController < PseudoSessionController { "candidates" => data, "extras" => { - "criteria" => criteria + "criteria" => criteria, + "advanced-search" => t("recruitment.advanced_search") }, "total_pages" => total_pages } @@ -116,7 +117,8 @@ class RecruitmentsController < PseudoSessionController { "jobs" => jobs, "extras" => { - "criteria" => criteria + "criteria" => criteria, + "advanced-search" => t("recruitment.advanced_search") }, "total_pages" => total_pages } @@ -279,9 +281,9 @@ class RecruitmentsController < PseudoSessionController current_loggedin_user = RecruitProfile.where(:pseudo_member_id => pu.user_name).first rescue nil if !current_loggedin_user.nil? && current_loggedin_user.is_employee? if !current_loggedin_user.profile.is_job_applied?(job.id.to_s) - applybtn = "Apply" + applybtn = "#{"recruitment.apply"}" else - applybtn = "Already Applied" + applybtn = "#{"recruitment.already_applied"}" end end end @@ -611,6 +613,19 @@ class RecruitmentsController < PseudoSessionController @academic_types = ["type1","type2","type3"].collect{|t| [t("recruitment.academic_type.#{t}"), t]} end + # ------ ------ account settings ------ ------- # + def account_settings + end + + def update_settings + pu = PseudoUser.where(:user_name => @profile.pseudo_member_id).first + if pu.update_password(params[:password],params[:password_confirmation]) + redirect_to mydashboard_path + else + redirect_to account_settings_path(:err => "1") + end + end + private def filter_jobs(params, type) diff --git a/app/views/recruitments/_dashboard_header.html.erb b/app/views/recruitments/_dashboard_header.html.erb index 855d5e3..3269e9d 100644 --- a/app/views/recruitments/_dashboard_header.html.erb +++ b/app/views/recruitments/_dashboard_header.html.erb @@ -1,11 +1,12 @@