Merge pull request #765 from dod-ccpo/fix-add-member-modal

Fix add member form

js/components/forms/base_form.js

@@ -22,5 +22,5 @@ export default {
     levelofwarrant,
     Modal,
   },
-  mixins: [FormMixin, Modal],
+  mixins: [FormMixin],
 }

templates/fragments/admin/portfolio_members.html

@@ -57,6 +57,10 @@
 
           </table>
         </div>
+      {% endif %}
+      </form>
+    </base-form>
+
     <div class="panel__footer">
       <div class="action-group save">
         {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
@@ -69,10 +73,6 @@
       </div>
     </div>
 
-      {% endif %}
-      </form>
-    </base-form>
-
     {% if user_can(permissions.EDIT_PORTFOLIO_USERS) %}
       {% for member in portfolio.members %}
         {% set modal_id = "portfolio_id_{}_user_id_{}".format(portfolio.id, member.user_id) %}