From 61f4fbd1d43ef403022c52a3291d771abad16d80 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Thu, 1 Sep 2016 13:23:53 +0200
Subject: [PATCH 1/2] Remove warning info when removing pending user from
 organization

---
 ...troy_user_organization_modal_body.html.erb | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/views/users/settings/organizations/_destroy_user_organization_modal_body.html.erb b/app/views/users/settings/organizations/_destroy_user_organization_modal_body.html.erb
index 8a012e12f..87ce8a030 100644
--- a/app/views/users/settings/organizations/_destroy_user_organization_modal_body.html.erb
+++ b/app/views/users/settings/organizations/_destroy_user_organization_modal_body.html.erb
@@ -1,13 +1,15 @@
 <%= bootstrap_form_for user_organization, url: destroy_user_organization_path(user_organization, format: :json), remote: :true, method: :delete, data: { id: "destroy-user-organization-form" } do |f| %>
   <p><%= t("users.settings.organizations.edit.destroy_uo_message", user: user_organization.user.full_name, org: user_organization.organization.name) %></p>
-  <div class="alert alert-danger" role="alert">
-    <span class="glyphicon glyphicon-exclamation-sign"></span>
-    &nbsp;
-    <%= t("users.settings.organizations.edit.destroy_uo_alert_heading") %>
-    <ul>
-      <li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_1") %></li>
-      <li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_2").html_safe %></li>
-      <li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_3") %></li>
-    </ul>
-  </div>
+  <% if user_organization.user.confirmed? %>
+    <div class="alert alert-danger" role="alert">
+      <span class="glyphicon glyphicon-exclamation-sign"></span>
+      &nbsp;
+      <%= t("users.settings.organizations.edit.destroy_uo_alert_heading") %>
+      <ul>
+        <li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_1") %></li>
+        <li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_2").html_safe %></li>
+        <li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_3") %></li>
+      </ul>
+    </div>
+  <% end %>
 <% end %>
\ No newline at end of file

From 1d8600b39f842712352aafccdba8233e27f31399 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Mon, 5 Sep 2016 14:52:56 +0200
Subject: [PATCH 2/2] Fix bug when inviting existing users onto teams

Closes SCI-228
---
 .../javascripts/users/settings/organizations/add_user_modal.js   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/users/settings/organizations/add_user_modal.js b/app/assets/javascripts/users/settings/organizations/add_user_modal.js
index 1f0f4e6d9..b432829b1 100644
--- a/app/assets/javascripts/users/settings/organizations/add_user_modal.js
+++ b/app/assets/javascripts/users/settings/organizations/add_user_modal.js
@@ -55,6 +55,7 @@ inviteExistingCollapsible
 .on("shown.bs.collapse", function() {
   // Focus input when collapsible is shown
   inviteExistingQuery.focus();
+  invitingExisting = true;
 });
 
 inviteNewCollapsible