Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions configstore/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ def add_view(self, request, form_url='', extra_context=None):
model = self.model
opts = model._meta
app_label = opts.app_label
ordered_objects = opts.get_ordered_objects()
#ordered_objects = opts.get_ordered_objects()
obj = None
configs = CONFIGS.items()
def sort_by_label(a, b):
return cmp(a[1].name, b[1].name)
configs.sort(sort_by_label)
#configs.sort(sort_by_label)
context = {
'title': _('Select %s') % opts.verbose_name,
'configs': configs,
#'adminform': adminForm,
'is_popup': request.REQUEST.has_key('_popup'),
#'is_popup': request.REQUEST.has_key('_popup'),
'show_delete': False,
#'media': mark_safe(media),
#'inline_admin_formsets': inline_admin_formsets,
Expand All @@ -56,7 +56,7 @@ def sort_by_label(a, b):
'has_delete_permission': self.has_delete_permission(request, obj),
'has_file_field': False, # FIXME - this should check if form or formsets have a FileField,
'has_absolute_url': hasattr(self.model, 'get_absolute_url'),
'ordered_objects': ordered_objects,
#'ordered_objects': ordered_objects,
'form_url': mark_safe(form_url),
'opts': opts,
'content_type_id': ContentType.objects.get_for_model(self.model).id,
Expand Down
29 changes: 29 additions & 0 deletions configstore/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 2.1 on 2018-09-11 22:45

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('sites', '0002_alter_domain_unique'),
]

operations = [
migrations.CreateModel(
name='Configuration',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('key', models.CharField(max_length=50)),
('_data', models.TextField(db_column='data')),
('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
],
),
migrations.AlterUniqueTogether(
name='configuration',
unique_together={('key', 'site')},
),
]
Empty file.