Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Intellectual property labels #3649

Merged
merged 5 commits into from
Jul 6, 2021
Merged

Intellectual property labels #3649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f21121
openstack sync - remove projects from processed provider only
szymi- Jun 29, 2021
00d8aa9
intellectual property labels
szymi- Jul 1, 2021
e4ee54b
Merge branch 'ng' of github.com:allegro/ralph into intellectual_prope…
szymi- Jul 1, 2021
91a727a
flake fixes
szymi- Jul 1, 2021
c9b5453
remove design and patent type
szymi- Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 39 additions & 17 deletions src/ralph/trade_marks/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
TradeMarkAdditionalCountry,
TradeMarkCountry,
TradeMarkRegistrarInstitution,
TradeMarksLinkedDomains,
TradeMarkType
TradeMarksLinkedDomains
)


Expand Down Expand Up @@ -74,26 +73,26 @@ class IntellectualPropertyAdminBase(AttachmentsMixin, RalphAdmin):
'technical_owner', 'business_owner', 'holder',
]
list_filter = [
'registrant_number',
'type',
'number',
('valid_from', DateListFilter),
('valid_to', DateListFilter),
'additional_markings',
'holder',
'status',
]
list_display = [
'registrant_number', 'region', 'name', 'registrant_class',
'number', 'region', 'name', 'classes',
'valid_from', 'valid_to', 'status', 'holder', 'representation',
'get_database_link'
]
raw_id_fields = [
'business_owner', 'technical_owner', 'holder'
]
fieldsets = (
(_('Basic info'), {
'fields': (
'name', 'registrant_number', 'type', 'image', 'image_tag',
'registrant_class', 'valid_from', 'valid_to',
'name', 'database_link', 'number', 'image', 'image_tag',
'classes', 'valid_from', 'valid_to',
'registrar_institution', 'order_number_url',
'additional_markings', 'holder', 'status', 'remarks'
)
Expand All @@ -105,23 +104,32 @@ class IntellectualPropertyAdminBase(AttachmentsMixin, RalphAdmin):
})
)

def get_database_link(self, obj):
if obj.database_link:
return mark_safe(
'<a target="_blank" href="{}">link</a>'.format(
obj.database_link
)
)
else:
return '-'

get_database_link.short_description = _('Database link')

def representation(self, obj):
if obj.image:
return self.image_tag(obj)
else:
return TradeMarkType.desc_from_id(obj.type)

representation.allow_tags = True
return '-'

def image_tag(self, obj):
if not obj.image:
return ""
return mark_safe(
'<img src="%s" width="150" />' % obj.image.url
'<img src="{}" width="150" />'.format(obj.image.url)
)

image_tag.short_description = _('Image')
image_tag.allow_tags = True


@register(TradeMark)
Expand All @@ -130,7 +138,7 @@ class TradeMarkAdmin(IntellectualPropertyAdminBase):
change_views = [TradeMarksLinkedDomainsView]
form = TradeMarkForm
list_filter = [
'registrant_number',
'number',
'type',
('valid_from', DateListFilter),
('valid_to', DateListFilter),
Expand All @@ -143,6 +151,22 @@ class TradeMarkAdmin(IntellectualPropertyAdminBase):
)
]

fieldsets = (
(_('Basic info'), {
'fields': (
'name', 'database_link', 'number', 'type', 'image', 'image_tag',
'classes', 'valid_from', 'valid_to',
'registrar_institution', 'order_number_url',
'additional_markings', 'holder', 'status', 'remarks'
)
}),
(_('Ownership info'), {
'fields': (
'business_owner', 'technical_owner'
)
})
)

def region(self, obj):
return ', '.join(
tm_country.country.name for tm_country in
Expand All @@ -168,8 +192,7 @@ class DesignAdmin(IntellectualPropertyAdminBase):
change_views = [DesignLinkedDomainsView]
form = DesignForm
list_filter = [
'registrant_number',
'type',
'number',
('valid_from', DateListFilter),
('valid_to', DateListFilter),
'additional_markings',
Expand Down Expand Up @@ -205,8 +228,7 @@ class PatentAdmin(IntellectualPropertyAdminBase):
change_views = [PatentLinkedDomainsView]
form = PatentForm
list_filter = [
'registrant_number',
'type',
'number',
('valid_from', DateListFilter),
('valid_to', DateListFilter),
'additional_markings',
Expand Down
10 changes: 0 additions & 10 deletions src/ralph/trade_marks/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.forms import CheckboxSelectMultiple
from django.utils.translation import ugettext_lazy as _

from ralph.admin.mixins import RalphAdminForm
from ralph.trade_marks.models import Design, Patent, TradeMark
Expand All @@ -16,22 +15,13 @@ class Meta:
class TradeMarkForm(IntellectualPropertyForm):
class Meta(IntellectualPropertyForm.Meta):
model = TradeMark
labels = {
'name': _('Trade Mark Name'),
}


class DesignForm(IntellectualPropertyForm):
class Meta(IntellectualPropertyForm.Meta):
model = Design
labels = {
'name': _('Design Name'),
}


class PatentForm(IntellectualPropertyForm):
class Meta(IntellectualPropertyForm.Meta):
model = Patent
labels = {
'name': _('Patent Name'),
}
89 changes: 89 additions & 0 deletions src/ralph/trade_marks/migrations/0009_auto_20210630_1719.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('trade_marks', '0008_auto_20210625_0738'),
]

operations = [
migrations.RenameField(
model_name='design',
old_name='registrant_class',
new_name='classes',
),
migrations.RenameField(
model_name='design',
old_name='registrant_number',
new_name='number',
),
migrations.RenameField(
model_name='patent',
old_name='registrant_class',
new_name='classes',
),
migrations.RenameField(
model_name='patent',
old_name='registrant_number',
new_name='number',
),
migrations.RenameField(
model_name='trademark',
old_name='registrant_class',
new_name='classes',
),
migrations.RenameField(
model_name='trademark',
old_name='registrant_number',
new_name='number',
),
migrations.AlterField(
model_name='design',
name='holder',
field=models.ForeignKey(blank=True, null=True, to='assets.AssetHolder'),
),
migrations.AlterField(
model_name='design',
name='status',
field=models.PositiveIntegerField(default=5, choices=[(1, 'Application filed'), (2, 'Application refused'), (3, 'Application withdrawn'), (4, 'Application opposed'), (5, 'Registered'), (6, 'Registration invalidated'), (7, 'Registration expired')]),
),
migrations.AlterField(
model_name='design',
name='type',
field=models.PositiveIntegerField(default=2, choices=[(1, 'Word'), (2, 'Figurative'), (3, 'Word - Figurative')]),
),
migrations.AlterField(
model_name='patent',
name='holder',
field=models.ForeignKey(blank=True, null=True, to='assets.AssetHolder'),
),
migrations.AlterField(
model_name='patent',
name='status',
field=models.PositiveIntegerField(default=5, choices=[(1, 'Application filed'), (2, 'Application refused'), (3, 'Application withdrawn'), (4, 'Application opposed'), (5, 'Registered'), (6, 'Registration invalidated'), (7, 'Registration expired')]),
),
migrations.AlterField(
model_name='patent',
name='type',
field=models.PositiveIntegerField(default=2, choices=[(1, 'Word'), (2, 'Figurative'), (3, 'Word - Figurative')]),
),
migrations.AlterField(
model_name='trademark',
name='holder',
field=models.ForeignKey(blank=True, null=True, to='assets.AssetHolder'),
),
migrations.AlterField(
model_name='trademark',
name='status',
field=models.PositiveIntegerField(default=5, choices=[(1, 'Application filed'), (2, 'Application refused'), (3, 'Application withdrawn'), (4, 'Application opposed'), (5, 'Registered'), (6, 'Registration invalidated'), (7, 'Registration expired')]),
),
migrations.AlterField(
model_name='trademark',
name='type',
field=models.PositiveIntegerField(default=2, choices=[(1, 'Word'), (2, 'Figurative'), (3, 'Word - Figurative')]),
),
]
72 changes: 72 additions & 0 deletions src/ralph/trade_marks/migrations/0010_auto_20210702_1129.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('trade_marks', '0009_auto_20210630_1719'),
]

operations = [
migrations.RemoveField(
model_name='design',
name='type',
),
migrations.RemoveField(
model_name='patent',
name='type',
),
migrations.AddField(
model_name='design',
name='database_link',
field=models.URLField(max_length=255, blank=True, null=True),
),
migrations.AddField(
model_name='patent',
name='database_link',
field=models.URLField(max_length=255, blank=True, null=True),
),
migrations.AddField(
model_name='trademark',
name='database_link',
field=models.URLField(max_length=255, blank=True, null=True),
),
migrations.AlterField(
model_name='design',
name='classes',
field=models.CharField(max_length=255),
),
migrations.AlterField(
model_name='design',
name='number',
field=models.CharField(max_length=255),
),
migrations.AlterField(
model_name='patent',
name='classes',
field=models.CharField(max_length=255),
),
migrations.AlterField(
model_name='patent',
name='number',
field=models.CharField(max_length=255),
),
migrations.AlterField(
model_name='trademark',
name='classes',
field=models.CharField(max_length=255),
),
migrations.AlterField(
model_name='trademark',
name='number',
field=models.CharField(max_length=255),
),
migrations.AlterField(
model_name='trademark',
name='type',
field=models.PositiveIntegerField(verbose_name='Trade Mark type', default=2, choices=[(1, 'Word'), (2, 'Figurative'), (3, 'Word - Figurative')]),
),
]
Loading