Merge pull request #871 from openstax/2020.07.15_last_minute_fixes

Minor bug fixes for release
openstax · Jul 15, 2020 · 751f585 · 751f585
2 parents 8e096eb + 9cb971b
commit 751f585
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/assets/javascripts/newflow/educator_complete_dynamic.js.coffee b/app/assets/javascripts/newflow/educator_complete_dynamic.js.coffee
@@ -173,7 +173,7 @@ class NewflowUi.EducatorComplete
       @total_num_students.show()
       @please_fill_out_total_num.hide()
       @onHowUsingChange()
-    else if ( @findOrLogNotFound($(document), '#signup_educator_specific_role_admin').is(':checked') && @checkSchoolNameValid() )
+    else if ( @findOrLogNotFound($(document), '#signup_educator_specific_role_administrator').is(':checked') && @checkSchoolNameValid() )
       @other_specify.hide()
       @books_used.hide()
       @total_num_students.hide()

diff --git a/app/routines/newflow/educator_signup/process_sheerid_webhook_request.rb b/app/routines/newflow/educator_signup/process_sheerid_webhook_request.rb
@@ -18,11 +18,11 @@ def exec(verification_id:)
         existing_user = EmailAddress.verified.find_by(value: verification.email)&.user
 
         if verification.errors.none? && verification.verified? && existing_user
-          VerifyEducator.perform_later(verification_id: verification_id, user: user)
+          VerifyEducator.perform_later(verification_id: verification_id, user: existing_user)
         elsif verification.errors.present?
           Rails.logger.warn("#{self.class.name} ERROR! #{verification.errors.full_messages}")
         elsif verification.rejected? && existing_user
-          run(SheeridRejectedEducator, user: user, verification_id: verification_id)
+          run(SheeridRejectedEducator, user: existing_user, verification_id: verification_id)
         elsif verification.present? && existing_user.present?
           existing_user.faculty_status = verification.current_step_to_faculty_status
           existing_user.sheerid_verification_id = verification_id if existing_user.sheerid_verification_id.blank?

diff --git a/app/views/newflow/educator_signup/educator_profile_form.html.erb b/app/views/newflow/educator_signup/educator_profile_form.html.erb
@@ -5,7 +5,7 @@
     <%
       educator_complete_roles = [
         [ I18n.t(:'educator_profile_form.instructor'), 'instructor', false ],
-        [ I18n.t(:'educator_profile_form.administrator'), 'admin', false ],
+        [ I18n.t(:'educator_profile_form.administrator'), 'administrator', false ],
         [ I18n.t(:'educator_profile_form.other'), 'other', false ]
       ]
     %>