some admin tweaks

gms/memberdb/admin.py

@@ -67,7 +67,7 @@ class MemberAdmin(admin.ModelAdmin):
 Define the admin page for viewing normal Member records (all details included) and approving them
 """
 class MembershipAdmin(admin.ModelAdmin):
-    list_display = ['membership_info', 'membership_type', 'payment_method', 'approved', 'date_submitted', 'member_actions']
+    list_display = ['membership_info', 'member_actions', 'membership_type', 'payment_method', 'approved', 'date_submitted', ]
     list_display_links = None
     list_filter = ['approved']
     readonly_fields = ['date_submitted']

gms/memberdb/approve.py

@@ -16,14 +16,14 @@ def get_membership_type(member):
     best = None
     is_fresh = member.memberships.all().count() == 0
     for t in MEMBERSHIP_TYPES_:
-        if (t['must_be_fresh'] == is_fresh):
+        if (t['must_be_fresh'] == is_fresh and t['is_student'] == member.is_student and t['is_guild'] == member.is_guild):
             best = t
             break
         elif (t['is_student'] == member.is_student and t['is_guild'] == member.is_guild):
             best = t
             break
     if (best is None):
-        return MEMBERSHIP_TYPES_[0]['dispense']
+        return MEMBERSHIP_TYPES_[1]['dispense']
     else:
         return best['dispense']