From 803c195947a6e64712aea6cc7d45cf9949a6a4f6 Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Fri, 23 Feb 2018 17:27:28 +0000
Subject: [PATCH] Removed edit permissions on the org users page. Remove a user
 from organisation can be done later.

---
 .../views/organisations/organisation/users/index.html       | 2 --
 tests/app/main/views/test_organisations.py                  | 6 ++----
 tests/app/main/views/test_register.py                       | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/templates/views/organisations/organisation/users/index.html b/app/templates/views/organisations/organisation/users/index.html
index d2edfbfee..896be8dc4 100644
--- a/app/templates/views/organisations/organisation/users/index.html
+++ b/app/templates/views/organisations/organisation/users/index.html
@@ -55,8 +55,6 @@
           <li class="tick-cross-list-edit-link">
             {% if user.status == 'pending' %}
               <a href="{{ url_for('.cancel_invited_org_user', org_id=current_org.id, invited_user_id=user.id)}}">Cancel invitation</a>
-            {% elif user.state == 'active' and current_user.id != user.id %}
-              <a href="{{ url_for('.edit_user_org_permissions', org_id=current_org.id, user_id=user.id)}}">Edit permissions</a>
             {% endif %}
           </li>
         </ul>
diff --git a/tests/app/main/views/test_organisations.py b/tests/app/main/views/test_organisations.py
index 5c5a005df..75059ac0d 100644
--- a/tests/app/main/views/test_organisations.py
+++ b/tests/app/main/views/test_organisations.py
@@ -1,7 +1,7 @@
 import pytest
 
 from bs4 import BeautifulSoup
-from flask import url_for, Response
+from flask import url_for
 
 from datetime import (
     datetime,
@@ -11,11 +11,9 @@ from datetime import (
 from tests.conftest import (
     normalize_spaces
 )
-from unittest.mock import ANY, Mock
+from unittest.mock import ANY
 from app.notify_client.models import InvitedOrgUser
 
-from notifications_python_client.errors import HTTPError
-
 
 def test_organisation_page_shows_all_organisations(
     logged_in_platform_admin_client,
diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py
index 2cd9d7c43..7615341e2 100644
--- a/tests/app/main/views/test_register.py
+++ b/tests/app/main/views/test_register.py
@@ -207,7 +207,6 @@ def test_register_from_invite(
 def test_register_from_invite_when_user_registers_in_another_browser(
     client,
     api_user_active,
-    mock_is_email_not_unique,
     mock_get_user_by_email,
     mock_accept_invite,
 ):