a little more merging

harvard-lil · Jul 29, 2015 · 9950cbb · 9950cbb
1 parent 61eaadd
commit 9950cbb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/perma_web/perma/templates/user_management/manage_users.html b/perma_web/perma/templates/user_management/manage_users.html
@@ -118,19 +118,11 @@ <h3>Existing {{ pretty_group_name_plural|lower }} <small><a data-toggle="collaps
                   </a>
                   <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                     <li>
-<<<<<<< HEAD
-                        <a {% if status == 'active' %}class="selected" {% endif %}href="?status=active&page={{ users.number }}{% if search_query %}&q={{ search_query }}{% endif %}{% if sort %}&sort={{ sort }}{% endif %}{% if vesting_org_filter %}&vesting_org={{ vesting_org_filter.id }}{% endif %}{% if registrar_filter %}&registrar={{ registrar_filter.id }}{% endif %}{% if upgrade %}&upgrade={{ upgrade }}{% endif %}"><i class="icon-ok"></i> Active</a>
-                        {% if request.user.is_staff and group_name == 'user' %}
-                        <a {% if status == 'deactivated' %}class="selected" {% endif %}href="?status=deactivated&page={{ users.number }}{% if search_query %}&q={{ search_query }}{% endif %}{% if sort %}&sort={{ sort }}{% endif %}{% if vesting_org_filter %}&vesting_org={{ vesting_org_filter.id }}{% endif %}{% if registrar_filter %}&registrar={{ registrar_filter.id }}{% endif %}{% if upgrade %}&upgrade={{ upgrade }}{% endif %}"><i class="icon-ok"></i> Deactivated</a>
-                        {% endif %}
-                        <a {% if status == 'unactivated' %}class="selected" {% endif %}href="?status=unactivated&page={{ users.number }}{% if search_query %}&q={{ search_query }}{% endif %}{% if sort %}&sort={{ sort }}{% endif %}{% if vesting_org_filter %}&vesting_org={{ vesting_org_filter.id }}{% endif %}{% if registrar_filter %}&registrar={{ registrar_filter.id }}{% endif %}{% if upgrade %}&upgrade={{ upgrade }}{% endif %}"><i class="icon-ok"></i> Unactivated</a>
-=======
                         <a {% if status == 'active' %}class="selected" {% endif %}href="?{% current_query_string status="active" %}"><i class="icon-ok"></i> Active</a>
                         {% if request.user.is_staff and group_name == 'user' %}
                             <a {% if status == 'deactivated' %}class="selected" {% endif %}href="?{% current_query_string status="deactivated" %}"><i class="icon-ok"></i> Deactivated</a>
                         {% endif %}
                         <a {% if status == 'unactivated' %}class="selected" {% endif %}href="?{% current_query_string status="unactivated" %}"><i class="icon-ok"></i> Unactivated</a>
->>>>>>> develop
                     </li>
                   </ul>
                 </div>
@@ -212,18 +204,12 @@ <h3>Existing {{ pretty_group_name_plural|lower }} <small><a data-toggle="collaps
                     {% include "user_management/includes/comma.html" %}
                 {% endfor %}
               </p>
-<<<<<<< HEAD
               <p class="list-vesting-org">
                 {% if request.user.is_staff and listed_user.requested_account_type %}
                     Interested in a {{listed_user.requested_account_type}} account with {{listed_user.requested_account_note}}
                 {% endif %}
               </p>
             {% if group_name == 'registrar_user' and request.user.is_staff %}<p class="list-registrar"><a href="{% url 'user_management_manage_registrar' %}?q={{listed_user.registrar.name.split|join:'+'|lower}}">{{ listed_user.registrar.name }}</a></p>{% endif %}
-=======
-              {% if group_name == 'registrar_user' and request.user.is_staff %}
-                  <p class="list-registrar"><a href="{% url 'user_management_manage_registrar' %}?q={{listed_user.registrar.name.split|join:'+'|lower}}">{{ listed_user.registrar.name }}</a></p>
-              {% endif %}
->>>>>>> develop
               </div>
               <div class="col-sm-3">
                 {% if group_name == 'organization_user' %}

diff --git a/perma_web/perma/views/user_management.py b/perma_web/perma/views/user_management.py
@@ -423,7 +423,6 @@ def list_users_in_group(request, group_name):
     # handle upgrade filter
     upgrade = request.GET.get('upgrade', '')
     if upgrade:
-        sort_url = '{sort_url}&upgrade={upgrade}'.format(sort_url=sort_url, upgrade=upgrade)
         users = users.filter(requested_account_type=upgrade)
 
     # handle org filter
@@ -474,7 +473,6 @@ def list_users_in_group(request, group_name):
         'org_filter': org_filter,
         'status': status,
         'upgrade': upgrade,
-        'sort_url': sort_url
     }
     context['pretty_group_name_plural'] = context['pretty_group_name'] + "s"