Skip to content

Commit

Permalink
Merge pull request #432 from FJNR-inc/develop
Browse files Browse the repository at this point in the history
New release
  • Loading branch information
RignonNoel authored Mar 17, 2020
2 parents d0d2526 + fea8d37 commit 1a168bb
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ckeditor_api/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

@admin.register(CKEditorPage)
class CKEditorPageAdmin(admin.ModelAdmin):
pass
readonly_fields = ('updated_at',)
18 changes: 18 additions & 0 deletions ckeditor_api/migrations/0002_auto_20200317_0822.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.10 on 2020-03-17 12:22

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('ckeditor_api', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='ckeditorpage',
name='updated_at',
field=models.DateTimeField(auto_now=True, verbose_name='Updated at'),
),
]
4 changes: 2 additions & 2 deletions ckeditor_api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class CKEditorPage(models.Model):
)

updated_at = models.DateTimeField(
verbose_name=_('Data'),
auto_now_add=True
verbose_name=_('Updated at'),
auto_now=True
)

def __str__(self):
Expand Down
1 change: 1 addition & 0 deletions ckeditor_api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ class CKEditorPageViewSet(viewsets.ModelViewSet):

serializer_class = serializers.CKEditorPageSerializer
queryset = CKEditorPage.objects.all()
filterset_fields = '__all__'
permission_classes = [permissions.IsAdminOrReadOnly]
1 change: 1 addition & 0 deletions cron_manager/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class ExecutionInline(admin.StackedInline):
verbose_name_plural = _('Executions')
fk_name = 'task'
readonly_fields = ('created_at',)
max_num = 10


class TaskAdmin(admin.ModelAdmin):
Expand Down

0 comments on commit 1a168bb

Please sign in to comment.