refactored UI for local config context

This commit is contained in:
John Anderson
2018-09-18 11:52:12 -04:00
parent 39b2a541af
commit 0bda0a9334
18 changed files with 38 additions and 140 deletions

View File

@@ -703,6 +703,11 @@ class ConfigContext(models.Model):
class ConfigContextModel(models.Model):
local_context_data = JSONField(
blank=True,
null=True,
)
class Meta:
abstract = True
@@ -717,8 +722,8 @@ class ConfigContextModel(models.Model):
data.update(context.data)
# If the object has local config context data defined, that data overwrites all rendered data
if self.local_config_context_data is not None:
data.update(self.local_config_context_data)
if self.local_context_data is not None:
data.update(self.local_context_data)
return data

View File

@@ -107,14 +107,10 @@ class ObjectConfigContextView(View):
obj = get_object_or_404(self.object_class, pk=pk)
source_contexts = ConfigContext.objects.get_for_object(obj)
model_name = self.object_class._meta.model_name
app_label = self.object_class._meta.app_label
return render(request, 'extras/object_configcontext.html', {
model_name: obj,
'obj': obj,
'perm_string': '{}.change_{}'.format(app_label, model_name),
'edit_url': '{}:{}_edit_localconfigcontext'.format(app_label, model_name),
'delete_url': '{}:{}_delete_localconfigcontext'.format(app_label, model_name),
'rendered_context': obj.get_config_context(),
'source_contexts': source_contexts,
'base_template': self.base_template,