Skip to content

Commit

Permalink
Merge pull request Polygant#310 from Polygant/OC-276
Browse files Browse the repository at this point in the history
Oc 276
  • Loading branch information
GreemDark committed Nov 22, 2023
2 parents a900dc8 + fa01c20 commit 0fd637d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
12 changes: 6 additions & 6 deletions admin_rest/admin_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ class UserFeeApiAdmin(DefaultApiAdmin):


@api_admin.register(UserKYC)
class UserKYCApiAdmin(DefaultApiAdmin):
class UserKYCApiAdmin(NoCreateMixin, DefaultApiAdmin):
search_fields = ['user__email']


Expand Down Expand Up @@ -467,7 +467,7 @@ class UserApiAdmin(DefaultApiAdmin, ReadOnlyMixin):


@api_admin.register(ExchangeUser)
class ExchangeUserApiAdmin(DefaultApiAdmin):
class ExchangeUserApiAdmin(NoCreateMixin, DefaultApiAdmin):
vue_resource_extras = {'aside': {'edit': True}}
list_display = ('id', 'date_joined', 'email', 'first_name', 'last_name', 'is_staff', 'is_superuser', 'is_active',
'user_type', 'kyc', 'kyc_reject_type', 'two_fa',
Expand Down Expand Up @@ -620,7 +620,7 @@ def drop_sms(self, request, queryset):


@api_admin.register(Transaction)
class TransactionApiAdmin(DefaultApiAdmin):
class TransactionApiAdmin(ReadOnlyMixin, DefaultApiAdmin):
list_display = ['user', 'created', 'reason', 'currency', 'amount', 'state']
filterset_fields = ['reason', 'currency', 'created', 'state',]
search_fields = ['user__email']
Expand Down Expand Up @@ -821,7 +821,7 @@ def get_queryset(self):

# TODO optimize
@api_admin.register(WithdrawalRequest)
class WithdrawalRequestAdmin(RestFulModelAdmin):
class WithdrawalRequestAdmin(ReadOnlyMixin, RestFulModelAdmin):
list_display = (
'created', 'user', 'approved', 'confirmed', 'currency', 'blockchain', 'amount',
'state', 'details', 'sci_gate', 'txid', 'is_freezed',)
Expand Down Expand Up @@ -944,7 +944,7 @@ def unconfirm(self, request, queryset):


@api_admin.register(UserDailyStat)
class UserPairDailyStatAdmin(NoDeleteMixin, DefaultApiAdmin):
class UserPairDailyStatAdmin(ReadOnlyMixin, DefaultApiAdmin):
list_display = ['user', 'pair', 'day', 'currency1', 'currency2', 'volume_got1', 'volume_got2',
'fee_amount_paid1', 'fee_amount_paid2', 'volume_spent1', 'volume_spent2']
readonly_fields = list_display
Expand Down Expand Up @@ -1084,7 +1084,7 @@ def export_all(self, request, queryset):


@api_admin.register(DisabledCoin)
class DisabledInoutCoinAdmin(DefaultApiAdmin):
class DisabledInoutCoinAdmin(NoCreateMixin, DefaultApiAdmin):
list_filter = ['currency'] + DISABLE_COIN_STATES
list_display = ['currency'] + DISABLE_COIN_STATES
readonly_fields = ('currency',)
Expand Down
7 changes: 4 additions & 3 deletions admin_rest/restful_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class CustomMetadata(SimpleMetadata):

def __init__(self, *args, **kwargs):
super(CustomMetadata, self).__init__(*args, **kwargs)
#TODO make consts for out fields
# TODO make consts for out fields
self.label_lookup[JSDatetimeField] = 'datetime'
self.label_lookup[PrimaryKeyRelatedField] = 'foreign'
self.label_lookup[ManyRelatedField] = 'foreign'
Expand Down Expand Up @@ -255,7 +255,6 @@ def determine_metadata(self, request, view):
fields = self.get_serializer_info(serializer)
metadata['filters'] = {k: v for k, v in fields.items() if v['filterable']}


return metadata

def get_inline_forms(self, view, inlines):
Expand Down Expand Up @@ -386,7 +385,8 @@ def get_field_info(self, field):
field_info['filterable'] = True

field_info['attributes'] = self.get_field_attributes(field, model_field)
field_info['attributes']['searchable'] = field.field_name in (view.vue_resource_extras.get('searchable_fields') or [])
field_info['attributes']['searchable'] = field.field_name in (
view.vue_resource_extras.get('searchable_fields') or [])

return field_info

Expand Down Expand Up @@ -540,6 +540,7 @@ def get_single_serializer(self, *args, **kwargs):

def get_serializer_representation_fn(self, cls):
"""Custom fields representation fn"""

def validate_fn(sf, instance):
"""
Object instance -> Dict of primitive datatypes.
Expand Down
4 changes: 2 additions & 2 deletions core/admin_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from core.models.inouts.withdrawal import WithdrawalLimitLevel, WithdrawalUserLimit
from core.models.stats import InoutsStats
from core.models.facade import SmsConfirmationHistory
from admin_rest.mixins import ReadOnlyMixin
from admin_rest.mixins import ReadOnlyMixin, NoCreateMixin

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -88,7 +88,7 @@ class WithdrawalLimitLevelAdmin(DefaultApiAdmin):


@api_admin.register(WithdrawalUserLimit)
class WithdrawalUserLimitAdmin(DefaultApiAdmin):
class WithdrawalUserLimitAdmin(NoCreateMixin, DefaultApiAdmin):
search_fields = ['user__email']
list_display = [
'id',
Expand Down

0 comments on commit 0fd637d

Please sign in to comment.