Skip to content

Commit

Permalink
fixes #21 -- adds 'angle_labels' option to multilayer dimensions
Browse files Browse the repository at this point in the history
  • Loading branch information
rhodges committed Apr 6, 2021
1 parent 102d27f commit 2e41f14
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
2 changes: 1 addition & 1 deletion data_manager/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class NestedMultilayerDimensionValueInline(nested_admin.NestedTabularInline):

class NestedMultilayerDimensionInline(nested_admin.NestedTabularInline):
model = MultilayerDimension
fields = (('name', 'label', 'order', 'animated'),)
fields = (('name', 'label', 'order', 'animated', 'angle_labels'),)
extra = 1
classes = ['collapse', 'open']
verbose_name_plural = 'Multilayer Dimensions'
Expand Down
18 changes: 18 additions & 0 deletions data_manager/migrations/0035_multilayerdimension_angle_labels.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.12 on 2021-04-05 23:44

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('data_manager', '0034_layer_label_field'),
]

operations = [
migrations.AddField(
model_name='multilayerdimension',
name='angle_labels',
field=models.BooleanField(default=False, help_text='display labels at an angle to make more fit'),
),
]
3 changes: 2 additions & 1 deletion data_manager/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ def dimensions(self):
'name': x.name,
'order': x.order,
'animated': x.animated,
'angle_labels': x.angle_labels,
'nodes': sorted([
{
'value': y.value,
Expand Down Expand Up @@ -830,7 +831,6 @@ def save(self, *args, **kwargs):
cache.delete('data_manager_theme_%d_%d' % (theme.pk, site.pk))
theme.dictCache(site.pk)


class AttributeInfo(models.Model):
display_name = models.CharField(max_length=255, blank=True, null=True)
field_name = models.CharField(max_length=255, blank=True, null=True)
Expand Down Expand Up @@ -894,6 +894,7 @@ class MultilayerDimension(models.Model):
label = models.CharField(max_length=50, help_text='label to be used in mapping tool slider')
order = models.IntegerField(default=100, help_text='the order in which this dimension will be presented among other dimensions on this layer')
animated = models.BooleanField(default=False, help_text='enable auto-toggling of layers across this dimension')
angle_labels = models.BooleanField(default=False, help_text='display labels at an angle to make more fit')
layer = models.ForeignKey(Layer, on_delete=models.CASCADE)

def __unicode__(self):
Expand Down

0 comments on commit 2e41f14

Please sign in to comment.