From 36d115bbf49eadf3f3587c96d3eadc20f693e00f Mon Sep 17 00:00:00 2001
From: Kabir Khan <kakh@microsoft.com>
Date: Mon, 19 Feb 2018 15:29:04 -0800
Subject: [PATCH 1/2] Hide user dropdown options during msa migration

---
 comprehensive/lms/templates/user_dropdown.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/comprehensive/lms/templates/user_dropdown.html b/comprehensive/lms/templates/user_dropdown.html
index 5d52b4d..8a18548 100644
--- a/comprehensive/lms/templates/user_dropdown.html
+++ b/comprehensive/lms/templates/user_dropdown.html
@@ -20,9 +20,7 @@ from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_
             <span class="sr-only">${_("Dashboard for:")}</span>
             <%
             username = self.real_user.username
-            profile_image_url = get_profile_image_urls_for_user(self.real_user)['small']
             %>
-            <!--<img class="menu-image" src="${profile_image_url}" alt="">-->
             ${username}
         </a>
         <div role="group" aria-label="User menu" class="user-menu">
@@ -55,7 +53,9 @@ from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_
             <div role="group" aria-label="User menu" class="user-menu">
                 <button class="dropdown" aria-expanded="false"><span class="sr">${_("More options dropdown")}</span><span class="fa fa-sort-desc" aria-hidden="true"></span></button>
                 <ul class="dropdown-menu" aria-label="More Options" role="menu">
-                    ${navigation_dropdown_menu_links()}
+                    % if request.get_full_path() not in ['/account/link', '/account/link/confirm']:                        
+                        ${navigation_dropdown_menu_links()}
+                    % endif
                     <li class="item"><a href="${reverse('logout')}" role="menuitem" class="dropdown-menuitem">${_("Sign Out")}</a></li>
                 </ul>
             </div>

From 8162cd80516fe8a5dcda96561eccf7861e2b66f4 Mon Sep 17 00:00:00 2001
From: Kabir Khan <kakh@microsoft.com>
Date: Thu, 22 Feb 2018 09:43:08 -0800
Subject: [PATCH 2/2] Change get_full_path() -> path

---
 comprehensive/lms/templates/user_dropdown.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/comprehensive/lms/templates/user_dropdown.html b/comprehensive/lms/templates/user_dropdown.html
index 8a18548..334df25 100644
--- a/comprehensive/lms/templates/user_dropdown.html
+++ b/comprehensive/lms/templates/user_dropdown.html
@@ -53,7 +53,7 @@ from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_
             <div role="group" aria-label="User menu" class="user-menu">
                 <button class="dropdown" aria-expanded="false"><span class="sr">${_("More options dropdown")}</span><span class="fa fa-sort-desc" aria-hidden="true"></span></button>
                 <ul class="dropdown-menu" aria-label="More Options" role="menu">
-                    % if request.get_full_path() not in ['/account/link', '/account/link/confirm']:                        
+                    % if request.path() not in ['/account/link', '/account/link/confirm']:                        
                         ${navigation_dropdown_menu_links()}
                     % endif
                     <li class="item"><a href="${reverse('logout')}" role="menuitem" class="dropdown-menuitem">${_("Sign Out")}</a></li>