|
|
@@ -93,7 +93,9 @@ class UserAdmin(AdtSearchMixin, AuthUserAdmin):
|
|
|
list_display = AuthUserAdmin.list_display + ('get_adhesion_link',)
|
|
|
list_select_related = ('profile', 'adhesion',)
|
|
|
ordering = ('adhesion__id',)
|
|
|
- search_fields = AuthUserAdmin.search_fields + ('=adhesion__id', 'adhesion__notes',)
|
|
|
+ search_fields = AuthUserAdmin.search_fields \
|
|
|
+ + ('profile__phone_number', 'profile__address', 'profile__notes',) \
|
|
|
+ + ('=adhesion__id', 'adhesion__notes',)
|
|
|
readonly_fields = ('get_adhesion_link',)
|
|
|
adhesion_search_field = 'adhesion__id'
|
|
|
|
|
|
@@ -209,8 +211,8 @@ class AdhesionAdmin(AdtSearchMixin, admin.ModelAdmin):
|
|
|
fields = ('id', 'type', 'get_adherent_link', 'get_membership_link', 'get_antennas_link',)
|
|
|
readonly_fields = ('id', 'type', 'get_adherent_link', 'get_membership_link', 'get_antennas_link',)
|
|
|
search_fields = ('=id', 'notes',) \
|
|
|
- + tuple(['user__%s' % f for f in UserAdmin.search_fields if '__' not in f]) \
|
|
|
- + tuple(['corporation__%s' % f for f in CorporationAdmin.search_fields if '__' not in f])
|
|
|
+ + tuple(['user__%s' % f for f in UserAdmin.search_fields if 'adhesion' not in f]) \
|
|
|
+ + tuple(['corporation__%s' % f for f in CorporationAdmin.search_fields if 'adhesion' not in f])
|
|
|
inlines = (ServiceInline,)
|
|
|
|
|
|
def get_id(self, obj):
|
