Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 0b8af45

Browse files
authored
Merge pull request #1 from ixc/feature/rename-to-glamkit-collections
Rename project to "glamkit-collections"
2 parents 1a8d9f6 + 5031d47 commit 0b8af45

File tree

26 files changed

+26
-23
lines changed

26 files changed

+26
-23
lines changed

collectionkit/contrib/work_creator/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config = 'glamkit_collections.contrib.work_creator.apps.AppConfig'

collectionkit/contrib/work_creator/admin/creator.py renamed to glamkit_collections/contrib/work_creator/admin/creator.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from django.contrib import admin
22
from icekit.admin import FluentLayoutsMixin
33

4-
from collectionkit.contrib.work_creator.admin_utils import WorkThumbnailMixin, admin_link, \
5-
admin_url
4+
from glamkit_collections.contrib.work_creator.admin_utils import \
5+
WorkThumbnailMixin, admin_link, admin_url
6+
67

78
class WorkInline(admin.TabularInline, WorkThumbnailMixin):
89
"""
@@ -22,7 +23,6 @@ class WorkInline(admin.TabularInline, WorkThumbnailMixin):
2223
)
2324
extra = 0
2425

25-
2626
def artwork_link(self, obj):
2727
return admin_link(obj.artwork)
2828
artwork_link.allow_tags = True
@@ -36,7 +36,8 @@ def has_add_permission(self, request):
3636
def thumbnail_link(self, obj):
3737
link = admin_url(obj.artwork)
3838
style = ""
39-
return "<a href='%s' style='%s'>%s</a>" % (link, style, self.thumbnail(obj) or "No thumbnail")
39+
return "<a href='%s' style='%s'>%s</a>" % (
40+
link, style, self.thumbnail(obj) or "No thumbnail")
4041
thumbnail_link.allow_tags = True
4142

4243

@@ -56,5 +57,3 @@ class CreatorAdmin(FluentLayoutsMixin):
5657
)
5758

5859
raw_id_fields = ['portrait', ]
59-
60-

collectionkit/contrib/work_creator/admin/image.py renamed to glamkit_collections/contrib/work_creator/admin/image.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from django.contrib import admin
22
from django.template.defaultfilters import filesizeformat
33
from django_object_actions import DjangoObjectActions
4-
from collectionkit.contrib.work_creator.admin_utils import WorkThumbnailMixin, admin_url, \
5-
admin_link
4+
from glamkit_collections.contrib.work_creator.admin_utils import \
5+
WorkThumbnailMixin, admin_url, admin_link
66

77

88
class WorkImageInline(admin.TabularInline, WorkThumbnailMixin):
@@ -11,7 +11,7 @@ class WorkImageInline(admin.TabularInline, WorkThumbnailMixin):
1111
model = ArtworkImage
1212
"""
1313

14-
thumbnail_options = {'size': (160,120)}
14+
thumbnail_options = {'size': (160, 120)}
1515
thumbnail_field = 'downloaded_image'
1616

1717
fields = (
@@ -49,8 +49,8 @@ def thumbnail_link(self, obj):
4949
thumbnail_link.allow_tags = True
5050

5151

52-
class WorkImageAdmin(DjangoObjectActions, admin.ModelAdmin, WorkThumbnailMixin):
53-
52+
class WorkImageAdmin(DjangoObjectActions, admin.ModelAdmin,
53+
WorkThumbnailMixin):
5454

5555
list_display = (
5656
'thumbnail',
@@ -63,7 +63,7 @@ class WorkImageAdmin(DjangoObjectActions, admin.ModelAdmin, WorkThumbnailMixin):
6363
)
6464

6565
thumbnail_field = 'downloaded_image'
66-
thumbnail_options = {'size': (250,250)}
66+
thumbnail_options = {'size': (250, 250)}
6767

6868
search_fields = (
6969
'netx_id',
@@ -72,7 +72,8 @@ class WorkImageAdmin(DjangoObjectActions, admin.ModelAdmin, WorkThumbnailMixin):
7272
)
7373

7474
def image_link(self, obj):
75-
return "<a href='%s'>%s</a>" % (obj.downloaded_image.url, self.thumbnail(obj))
75+
return "<a href='%s'>%s</a>" % (
76+
obj.downloaded_image.url, self.thumbnail(obj))
7677
image_link.allow_tags = True
7778
image_link.short_descrpition = "image"
7879

collectionkit/contrib/work_creator/admin/work.py renamed to glamkit_collections/contrib/work_creator/admin/work.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from icekit.admin import FluentLayoutsMixin
22
from .image import WorkImageInline
3-
from collectionkit.contrib.work_creator.admin_utils import WorkThumbnailMixin, admin_link
3+
from glamkit_collections.contrib.work_creator.admin_utils import \
4+
WorkThumbnailMixin, admin_link
5+
46

57
class WorkAdmin(FluentLayoutsMixin, WorkThumbnailMixin):
68

@@ -44,9 +46,9 @@ def admin_thumbnail(self, obj):
4446
if obj.admin_hero_image == obj.hero_image:
4547
message = ""
4648
else:
47-
message ="<br><span style='font-weight: normal'>(not public)</span>"
49+
message = \
50+
"<br><span style='font-weight: normal'>(not public)</span>"
4851
return "%s%s" % (t, message)
4952
return ""
5053
admin_thumbnail.allow_tags = True
5154
admin_thumbnail.short_description = "thumbnail"
52-

0 commit comments

Comments
 (0)