diff --git a/docker-compose.yml b/docker-compose.yml
index a72bb82..27d2969 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
build:
context: .
dockerfile: ./docker/django
- command: celery worker --app newsreader --loglevel INFO --beat --scheduler django --workdir /app/src/
+ command: celery worker -n worker1@%h -n worker2@%h --app newsreader --loglevel INFO --concurrency 2 --workdir /app/src/ --beat --scheduler django
environment:
- DJANGO_SETTINGS_MODULE=newsreader.conf.docker
depends_on:
diff --git a/src/newsreader/js/pages/homepage/components/sidebar/CategoryItem.js b/src/newsreader/js/pages/homepage/components/sidebar/CategoryItem.js
index 7c0268c..563f8ad 100644
--- a/src/newsreader/js/pages/homepage/components/sidebar/CategoryItem.js
+++ b/src/newsreader/js/pages/homepage/components/sidebar/CategoryItem.js
@@ -40,8 +40,8 @@ class CategoryItem extends React.Component {
this.handleSelect()}>
- {this.props.category.name}
- {this.props.category.unread}
+ {this.props.category.name}
+ {this.props.category.unread}
diff --git a/src/newsreader/news/core/admin.py b/src/newsreader/news/core/admin.py
index 3bcfc19..e8c3c4b 100644
--- a/src/newsreader/news/core/admin.py
+++ b/src/newsreader/news/core/admin.py
@@ -1,21 +1,35 @@
from django.contrib import admin
+from django.db import models
+from django.forms import Textarea, TextInput, URLInput
from newsreader.news.core.models import Category, Post
class PostAdmin(admin.ModelAdmin):
- list_display = ("publication_date", "author", "rule", "title")
+ list_display = ("publication_date", "rule", "title")
list_display_links = ("title",)
list_filter = ("rule",)
ordering = ("-publication_date", "title")
- fields = ("title", "body", "author", "publication_date", "url")
+ fields = (
+ "remote_identifier",
+ "rule",
+ "url",
+ "title",
+ "body",
+ "publication_date",
+ "author",
+ )
- search_fields = ["title"]
+ readonly_fields = ("remote_identifier", "rule")
+ search_fields = ("title", "author", "rule__name")
- def rule(self, obj):
- return obj.rule
+ formfield_overrides = {
+ models.CharField: {"widget": TextInput(attrs={"size": "100"})},
+ models.URLField: {"widget": URLInput(attrs={"size": "100"})},
+ models.TextField: {"widget": Textarea(attrs={"rows": 10, "cols": 100})},
+ }
class CategoryAdmin(admin.ModelAdmin):
diff --git a/src/newsreader/scss/components/category/_category.scss b/src/newsreader/scss/components/category/_category.scss
index 683ed0b..e8e1ba9 100644
--- a/src/newsreader/scss/components/category/_category.scss
+++ b/src/newsreader/scss/components/category/_category.scss
@@ -14,16 +14,18 @@
overflow: hidden;
white-space: nowrap;
- & h4 {
- overflow: hidden;
- text-overflow: ellipsis;
- }
&:hover {
cursor: pointer;
}
}
+ &__name {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
&__menu {
display: flex;
align-items: center;