Changed to only using two permissions.

corputils/views.py

@@ -26,7 +26,6 @@ logger = logging.getLogger(__name__)
 
 # Because corp-api only exist for the executor corp, this function will only be available in corporation mode.
 @login_required
-@permission_required('auth.corputils')
 def corp_member_view(request, corpid = None):
     logger.debug("corp_member_view called by user %s" % request.user)
 
@@ -58,11 +57,8 @@ def corp_member_view(request, corpid = None):
     corp = EveCorporationInfo.objects.get(corporation_id=corpid)
     Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist", "apilist"])
 
-    send_apis = False
-
     if check_if_user_has_permission(request.user, 'alliance_apis') or (check_if_user_has_permission(request.user, 'corp_apis') and (user_corp_id == corpid)):
         logger.debug("Retreiving and sending API-information")
-        send_apis = True
 
         if settings.IS_CORP:
             try:
@@ -99,9 +95,9 @@ def corp_member_view(request, corpid = None):
                                                                 altlist=[],
                                                                 apilist=[])
                                                ).altlist.append(char)
-            if send_apis:
                 characters_with_api[mainname].apilist.append(EveApiKeyPair.objects.get(api_id=char.api_id))
 
+
             except EveCharacter.DoesNotExist:
                 characters_without_api.update({member_data["name"]: member_data["id"]})
 
@@ -109,7 +105,6 @@ def corp_member_view(request, corpid = None):
         if not settings.IS_CORP:
             context = {"membercorp_list": membercorp_list,
                        "corp": corp,
-                   "sent_apis": send_apis,
                        "characters_with_api": sorted(characters_with_api.items()),
                        'n_registered': num_registered_characters,
                        "characters_without_api": sorted(characters_without_api.items()),
@@ -117,34 +112,33 @@ def corp_member_view(request, corpid = None):
         else:
             logger.debug("corp_member_view running in corportation mode")
             context = {"corp": corp,
-                   "sent_apis": send_apis,
                        "characters_with_api": sorted(characters_with_api.items()),
                        'n_registered': num_registered_characters,
                        "characters_without_api": sorted(characters_without_api.items()),
                        "search_form": CorputilsSearchForm()}
 
-
         return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
+    return HttpResponseRedirect("/dashboard/")
 
 
 @login_required
-@permission_required('auth.corputils')
 def corputils_search(request, corpid=settings.CORP_ID):
     logger.debug("corputils_search called by user %s" % request.user)
 
     corp = EveCorporationInfo.objects.get(corporation_id=corpid)
 
-    send_apis = False
+    authorized = False
     try:
         user_main = EveCharacter.objects.get(character_id=AuthServicesInfoManager.get_auth_service_info(user=request.user).main_char_id)
         if check_if_user_has_permission(request.user, 'alliance_apis') or (check_if_user_has_permission(request.user, 'corp_apis') and (user_main.corporation_id == corpid)):
             logger.debug("Retreiving and sending API-information")
-            send_apis = True
+            authorized = True
     except (ValueError, EveCharacter.DoesNotExist):
         if check_if_user_has_permission(request.user, 'alliance_apis'):
             logger.debug("Retreiving and sending API-information")
-            send_apis = True
+            authorized = True
 
+    if authorized:
         if request.method == 'POST':
             form = CorputilsSearchForm(request.POST)
             logger.debug("Request type POST contains form valid: %s" % form.is_valid())
@@ -174,13 +168,11 @@ def corputils_search(request, corpid=settings.CORP_ID):
                             mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
                             mainname = EveCharacter.objects.get(character_id=mainid).character_name
                             api_registered = True
+                            apiinfo = EveApiKeyPair.objects.get(api_id=char.api_id)
                         except EveCharacter.DoesNotExist:
                             api_registered = False
                             char = None
                             mainname = ""
-                    if api_registered and send_apis:
-                        apiinfo = EveApiKeyPair.objects.get(api_id=char.api_id)
-                    else:
                             apiinfo = None
 
                         searchresults.append(SearchResult(name=member_data["name"], id=memberid, main=mainname, api_registered=api_registered,
@@ -189,7 +181,7 @@ def corputils_search(request, corpid=settings.CORP_ID):
 
                 logger.info("Found %s members for user %s matching search string %s" % (len(searchresults), request.user, searchstring))
 
-            context = {'corp': corp, 'results': searchresults, 'search_form': CorputilsSearchForm(), 'sent_apis': send_apis}
+                context = {'corp': corp, 'results': searchresults, 'search_form': CorputilsSearchForm()}
 
                 return render_to_response('registered/corputilssearchview.html',
                                           context, context_instance=RequestContext(request))
@@ -202,4 +194,6 @@ def corputils_search(request, corpid=settings.CORP_ID):
         else:
             logger.debug("Returning empty search form for user %s" % request.user)
             return HttpResponseRedirect("/corputils/")
+    return HttpResponseRedirect("/dashboard/")
+
 

stock/templates/public/base.html

@@ -124,7 +124,7 @@
                             </li>
                         {% endif %}
 
-                        {% if perms.auth.corp_stats %}
+                        {% if perms.auth.corp_apis or perms.auth.alliance_apis %}
                             <li>
                                 <a {% ifequal request.path "/corputils/" %} class="active" {% endifequal %}
                                                                                    href="{% url 'auth_corputils' %}"><i

stock/templates/registered/corputils.html

@@ -46,7 +46,7 @@
                         <nav class="navbar navbar-default">
                             <div class="container-fluid">
                                 <ul class="nav navbar-nav navbar-wide">
-                                    {% if membercorp_list %}
+                                    {% if membercorp_list and perms.auth.alliance_apis %}
                                     <li class="dropdown">
                                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Choose corporation <span class="caret"></span></a>
                                         <ul class="dropdown-menu scrollable">
@@ -91,9 +91,7 @@
                                             <th class="col-md-2">Main corporation</th>
                                             <th class="col-md-2">Character list</th>
                                             <th class="col-md-3">Killboard</th>
-                                            {% if sent_apis %}
                                             <th class="col-md-2">API JackKnife</th>
-                                            {% endif %}
                                         </tr>
                                         {% for maincharname, player  in characters_with_api %}
                                         <tr >
@@ -124,7 +122,6 @@
                                                 <p><a href="https://zkillboard.com/character/{{ char.character_id }}/" class="label label-danger" target="_blank">Killboard</a></p>
                                                 {% endfor %}
                                             </td>
-                                            {% if sent_apis %}
                                             <td>
                                                 {% for apiinfo in player.apilist %}
                                                 <p>
@@ -136,7 +133,6 @@
                                                 </p>
                                                 {% endfor %}
                                             </td>
-                                            {% endif %}
                                         </tr>
                                         {% endfor %}
                                     </table>

stock/templates/registered/corputilssearchview.html

@@ -38,9 +38,7 @@
                             <th class="col-md-2">Character</th>
                             <th class="col-md-2">Main character</th>
                             <th class="col-md-5">Killboard</th>
-                            {% if sent_apis %}
                             <th class="col-md-2">API JackKnife</th>
-                            {% endif %}
                         </tr>
                         {% for result in results %}
                             <tr >
@@ -59,7 +57,6 @@
                                     <p><a href="https://zkillboard.com/character/{{ result.char.character_id }}/" class="label label-danger" target="_blank">Killboard</a></p>
                                 </td>
 
-                                {% if sent_apis %}
                                 <td>
                                     {% if result.api_registered %}
                                     <a href="{{ JACK_KNIFE_URL }}?usid={{ result.apiinfo.api_id }}&apik={{ result.apiinfo.api_key }}"
@@ -69,7 +66,6 @@
                                     </a>
                                     {% endif %}
                                 </td>
-                                {% endif %}
                             </tr>
                         {% endfor %}
                     </table>

util/__init__.py

@@ -18,7 +18,6 @@ def bootstrap_permissions():
     Permission.objects.get_or_create(codename="jabber_broadcast_all", content_type=ct, name="jabber_broadcast_all")
     Permission.objects.get_or_create(codename="human_resources", content_type=ct, name="human_resources")
     Permission.objects.get_or_create(codename="blue_member", content_type=ct, name="blue_member")
-    Permission.objects.get_or_create(codename="corputils", content_type=ct, name="corputils")
     Permission.objects.get_or_create(codename="alliance_apis", content_type=ct, name="alliance_apis")
     Permission.objects.get_or_create(codename="corp_apis", content_type=ct, name="corp_apis")
     Permission.objects.get_or_create(codename="timer_management", content_type=ct, name="timer_management")