Fix server error on edit run

course_discovery/apps/publisher/templates/publisher/_personFieldLabel.html

@@ -2,14 +2,12 @@
     <input type="hidden" id="staff_{{ staff.id }}" name="staff" value="{{ staff.id }}">
     <div><img src="{{ staff.get_profile_image_url }}"></div>
     <div><a class="delete" id="{{ staff.id }}" href="#"><i class="fa fa-trash-o fa-fw"></i></a>
-        {% if (course_user_role == 'course_team' and (staff.position and staff.uuid and
-         staff.position.organization_id in organizations_ids or staff.position.organization_id is None)) or is_internal_user  %}
-            <a class="edit" id="{{ staff.uuid }}" href="#"><i class="fa fa-pencil-square-o fa-fw"></i></a>
-        {% endif %}
-        {% else %}
-            {% if not staff.profile_image_url %}
+        {% if course_user_role == 'course_team' %}
+            {% if staff.position and staff.uuid and staff.position.organization_id in organizations_ids or staff.position.organization_id is None %}
                 <a class="edit" id="{{ staff.uuid }}" href="#"><i class="fa fa-pencil-square-o fa-fw"></i></a>
             {% endif %}
+        {% elif not staff.profile_image_url %}
+            <a class="edit" id="{{ staff.uuid }}" href="#"><i class="fa fa-pencil-square-o fa-fw"></i></a>
         {% endif %}
         <b>{{ staff.full_name }}</b>
     </div>

course_discovery/static/js/publisher/instructors.js

@@ -178,7 +178,12 @@ function renderSelectedInstructor(id, name, image, uuid, organization_id, edit_i
 
 
     var user_is_course_team = course_user_role === "course_team";
-    var user_is_in_similar_org_as_instructor = $.inArray(parseInt(organization_id), JSON.parse(user_organizations_ids)) > -1;
+    if (organization_id != "None" && user_organizations_ids != "[]"){
+        var user_is_in_similar_org_as_instructor = $.inArray(parseInt(organization_id), JSON.parse(user_organizations_ids)) > -1;
+    }
+    else {
+        var user_is_in_similar_org_as_instructor = false;
+    }
     var org_is_none = organization_id === "None";
 
     if ((user_is_course_team && (user_is_in_similar_org_as_instructor && uuid || org_is_none)) || is_internal_user || edit_instructor) {