oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix local celery, change admin area import articles to a task

This commit is contained in:
Oliver Marks 2018-09-22 17:48:55 +01:00
parent e88311cecd
commit f41edd2156
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/settings/local.py
View File

@ -33,7 +33,7 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner'
########## CELERY ########## CELERY
# In development, all tasks will be executed locally by blocking until the task returns # In development, all tasks will be executed locally by blocking until the task returns
# CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
########## END CELERY ########## END CELERY
# Your local stuff: Below this line define 3rd party library settings # Your local stuff: Below this line define 3rd party library settings

4
local.yml
View File

@ -77,7 +77,7 @@ services:
celeryworker: celeryworker:
build: build:
context: . context: .
dockerfile: ./compose/django/Dockerfile dockerfile: ./compose/django/Dockerfile-dev
env_file: .env env_file: .env
volumes: volumes:
- .:/app - .:/app
@ -89,7 +89,7 @@ services:
celerybeat: celerybeat:
build: build:
context: . context: .
dockerfile: ./compose/django/Dockerfile dockerfile: ./compose/django/Dockerfile-dev
env_file: .env env_file: .env
volumes: volumes:
- .:/app - .:/app

33
mhackspace/feeds/admin.py
View File

@ -4,36 +4,41 @@ from django.conf.urls import url
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.urls import reverse from django.urls import reverse
from mhackspace.base.tasks import update_homepage_feeds
from mhackspace.feeds.models import Feed, Article from mhackspace.feeds.models import Feed, Article
from mhackspace.feeds.helper import import_feeds from mhackspace.feeds.helper import import_feeds
@admin.register(Feed) @admin.register(Feed)
class FeedAdmin(ModelAdmin): class FeedAdmin(ModelAdmin):
list_display = ('title', 'home_url', 'author', 'tags', 'enabled') list_display = ("title", "home_url", "author", "tags", "enabled")
list_filter = ('enabled',) list_filter = ("enabled",)
@admin.register(Article) @admin.register(Article)
class ArticleAdmin(ModelAdmin): class ArticleAdmin(ModelAdmin):
date_hierarchy = 'date' date_hierarchy = "date"
list_display = ('title', 'url', 'feed', 'date', 'displayed') list_display = ("title", "url", "feed", "date", "displayed")
list_filter = ('displayed', 'feed', 'feed__author') list_filter = ("displayed", "feed", "feed__author")
readonly_fields = ('original_image',) readonly_fields = ("original_image",)
ordering = ('-date',) ordering = ("-date",)
def get_urls(self): def get_urls(self):
urls = super(ArticleAdmin, self).get_urls() urls = super(ArticleAdmin, self).get_urls()
my_urls = [ my_urls = [
url(r'^import/$', self.admin_site.admin_view(self.import_articles)) url(r"^import/$", self.admin_site.admin_view(self.import_articles))
] ]
return my_urls + urls return my_urls + urls
def import_articles(self, request): def import_articles(self, request):
imported = import_feeds() update_homepage_feeds.delay()
self.message_user(request, 'Successfully imported %s articles' % len(imported)) self.message_user(
return HttpResponseRedirect(reverse('admin:feeds_article_changelist')) request,
"Importing articles in background refresh in a few minutes",
)
return HttpResponseRedirect(reverse("admin:feeds_article_changelist"))
admin.site.site_title = 'Maidstone Hackspace Admin Area'
admin.site.site_header = 'Maidstone Hackspace Admin Area' admin.site.site_title = "Maidstone Hackspace Admin Area"
admin.site.index_title = 'Maidstone Admin Home' admin.site.site_header = "Maidstone Hackspace Admin Area"
admin.site.index_title = "Maidstone Admin Home"