diff --git a/app/eve_api/admin.py b/app/eve_api/admin.py index 3a5a7b3..67e83e3 100644 --- a/app/eve_api/admin.py +++ b/app/eve_api/admin.py @@ -53,19 +53,6 @@ class EVEPlayerCharacterAdmin(admin.ModelAdmin): admin.site.register(EVEPlayerCharacter, EVEPlayerCharacterAdmin) -class EVEPlayerCharacterRoleAdmin(admin.ModelAdmin): - list_display = ('id', 'roleid', 'name') - search_fields = ['roleid', 'name'] - - def has_add_permission(self, request): - return False - - def has_delete_permission(self, request, obj=None): - return False - - -admin.site.register(EVEPlayerCharacterRole, EVEPlayerCharacterRoleAdmin) - class EVEPlayerCorporationInline(admin.TabularInline): model = EVEPlayerCorporation fields = ('name', 'ticker') @@ -98,6 +85,7 @@ class EVEPlayerCorporationAdmin(admin.ModelAdmin): list_display = ('id', 'name', 'ticker', 'member_count', 'alliance') search_fields = ['name', 'ticker'] readonly_fields = ('name', 'ticker', 'description', 'url', 'ceo_character', 'alliance', 'alliance_join_date', 'tax_rate', 'member_count', 'shares') + exclude = ('logo_graphic_id', 'logo_shape1', 'logo_shape2', 'logo_shape3', 'logo_color1', 'logo_color2', 'logo_color3') def has_add_permission(self, request): return False @@ -107,30 +95,3 @@ class EVEPlayerCorporationAdmin(admin.ModelAdmin): admin.site.register(EVEPlayerCorporation, EVEPlayerCorporationAdmin) - -class EVESkillAdmin(admin.ModelAdmin): - list_display = ('id', 'name', 'group' ) - search_fields = ['id', 'name'] - - def has_add_permission(self, request): - return False - - def has_delete_permission(self, request, obj=None): - return False - - -admin.site.register(EVESkill, EVESkillAdmin) - -class EVESkillGroupAdmin(admin.ModelAdmin): - list_display = ('id', 'name', ) - search_fields = ['id', 'name'] - - def has_add_permission(self, request): - return False - - def has_delete_permission(self, request, obj=None): - return False - - -admin.site.register(EVESkillGroup, EVESkillGroupAdmin) - diff --git a/app/eve_api/models/alliance.py b/app/eve_api/models/alliance.py index 9af71a1..de0a8ce 100644 --- a/app/eve_api/models/alliance.py +++ b/app/eve_api/models/alliance.py @@ -17,8 +17,8 @@ class EVEPlayerAlliance(EVEAPIModel): class Meta: app_label = 'eve_api' ordering = ['date_founded'] - verbose_name = 'Player Alliance' - verbose_name_plural = 'Player Alliances' + verbose_name = 'Alliance' + verbose_name_plural = 'Alliances' def __unicode__(self): if self.name: diff --git a/app/eve_api/models/character.py b/app/eve_api/models/character.py index f968d76..cf5ed41 100644 --- a/app/eve_api/models/character.py +++ b/app/eve_api/models/character.py @@ -86,8 +86,8 @@ class EVEPlayerCharacter(EVEAPIModel): class Meta: app_label = 'eve_api' - verbose_name = 'Player Character' - verbose_name_plural = 'Player Characters' + verbose_name = 'Character' + verbose_name_plural = 'Characters' permissions = ( ("can_view_all_characters", "Can view any character profile"), diff --git a/app/eve_api/models/corporation.py b/app/eve_api/models/corporation.py index 5821ea4..d1fff71 100644 --- a/app/eve_api/models/corporation.py +++ b/app/eve_api/models/corporation.py @@ -69,8 +69,8 @@ class EVEPlayerCorporation(EVEAPIModel): class Meta: app_label = 'eve_api' - verbose_name = 'Player Corporation' - verbose_name_plural = 'Player Corporations' + verbose_name = 'Corporation' + verbose_name_plural = 'Corporations' def __unicode__(self): if self.name: