Skip to content

Commit

Permalink
Added property of for simcards. (#3657)
Browse files Browse the repository at this point in the history
* Added property of for simcards.

* Deleted country from imports.
  • Loading branch information
lukaszkarykowski committed Aug 26, 2021
1 parent ba7b061 commit 63fba6b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/ralph/sim_cards/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class SIMCardAdmin(MulitiAddAdminMixin, TransitionAdminMixin, RalphAdmin):
show_transition_history = True
list_display = ['status', 'card_number', 'phone_number', 'pin1', 'puk1',
'user', 'owner', 'warehouse', 'carrier',
'quarantine_until']
'quarantine_until', 'property_of']
multiadd_summary_fields = list_display
raw_id_fields = ['warehouse', 'owner', 'user', 'carrier']

Expand All @@ -31,14 +31,14 @@ class SIMCardAdmin(MulitiAddAdminMixin, TransitionAdminMixin, RalphAdmin):
list_filter = [
'status', 'features', 'phone_number', 'card_number', 'warehouse',
'user', 'owner', 'user__segment', 'user__company', 'user__department',
'user__employee_id', 'carrier', 'quarantine_until'
'user__employee_id', 'carrier', 'quarantine_until', 'property_of'
]

fieldsets = (
(_('SIM Card Info'), {
'fields': (
'status', 'card_number', 'phone_number', 'pin1', 'puk1',
'pin2', 'puk2', 'carrier', 'remarks', 'features'
'pin2', 'puk2', 'carrier', 'remarks', 'features', 'property_of'

)
}),
Expand Down
21 changes: 21 additions & 0 deletions src/ralph/sim_cards/migrations/0004_simcard_property_of.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('assets', '0032_auto_20200909_1012'),
('sim_cards', '0003_auto_20181212_1254'),
]

operations = [
migrations.AddField(
model_name='simcard',
name='property_of',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='assets.AssetHolder'),
),
]
7 changes: 7 additions & 0 deletions src/ralph/sim_cards/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from django.db import models
from django.utils.translation import ugettext_lazy as _

from ralph.assets.models import AssetHolder
from ralph.attachments.utils import send_transition_attachments_to_user
from ralph.back_office.models import autocomplete_user, Warehouse
from ralph.lib.hooks import get_hook
Expand Down Expand Up @@ -142,6 +143,12 @@ class SIMCard(AdminAbsoluteUrlMixin, TimeStampMixin, models.Model,
SIMCardFeatures,
blank=True,
)
property_of = models.ForeignKey(
AssetHolder,
on_delete=models.PROTECT,
null=True,
blank=True,
)

def __str__(self):
return _('SIM Card: {}').format(self.phone_number)
Expand Down

0 comments on commit 63fba6b

Please sign in to comment.