pre fill organization edit instructor

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

@@ -6,7 +6,7 @@
             {% 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 %}
+        {% elif is_internal_user %}
             <a class="edit" id="{{ staff.uuid }}" href="#"><i class="fa fa-pencil-square-o fa-fw"></i></a>
         {% endif %}
         <b>{{ staff.full_name }}</b>

course_discovery/static/js/publisher/instructors.js

@@ -271,12 +271,19 @@ $(document).on('click', '.selected-instructor a.edit', function (e) {
     $.getJSON({
         url: btnInstructor.data('url') + uuid,
         success: function (data) {
+            if (data['position']['organization_id'] == null){
+                $('#organization_override').val(data['position']['organization_override']);
+                $('#org_container').hide();
+            }
+            else {
+                $('#id_organization').val(data['position']['organization_id']);
+                $('#org_override_container').hide()
+            }
             $('.select-image').attr('src', data['profile_image_url']);
             $('#given-name').val(data['given_name']);
             $('#family-name').val(data['family_name']);
             $('#title').val(data['position']['title']);
             $('#email').val(data['email']);
-            $('#id_organization').val(data['position']['organization_id']);
             $('#bio').val(data['bio']);
             $('#majorWorks').val(data['works'].join('\n'));
             $('#facebook').val(data['urls']['facebook']);