Merge branch 'dev'

UBAutograding · Jan 22, 2020 · c7cb238 · c7cb238
2 parents dedfb76 + 37169f4
commit c7cb238
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
@@ -503,8 +503,8 @@ def save_uploaded_roster
             fail "New user cannot be created in uploadRoster." if user.nil?
           else
             # Override current user
-            user.first_name = first_name
-            user.last_name = last_name
+            # user.first_name = first_name
+            # user.last_name = last_name
             user.school = school
             user.major = major
             user.year = year
@@ -554,8 +554,8 @@ def save_uploaded_roster
           end
 
           # Update user data
-          user.first_name = newCUD[:first_name]
-          user.last_name = newCUD[:last_name]
+          # user.first_name = newCUD[:first_name]
+          # user.last_name = newCUD[:last_name]
           user.school = newCUD[:school]
           user.major = newCUD[:major]
           user.year = newCUD[:year]