fix a couple of issues
This commit is contained in:
parent
f0a8f6b75c
commit
9ec636fbef
19
lifting/migrations/0003_auto_20150412_1739.py
Normal file
19
lifting/migrations/0003_auto_20150412_1739.py
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import models, migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('lifting', '0002_liftingoptions_default_bar'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='liftingoptions',
|
||||||
|
name='default_bar',
|
||||||
|
field=models.ForeignKey(default=1, to='inventory.Bar'),
|
||||||
|
),
|
||||||
|
]
|
@ -18,7 +18,7 @@ class LiftingOptions(models.Model):
|
|||||||
user = models.OneToOneField(User, related_name='lifting_options')
|
user = models.OneToOneField(User, related_name='lifting_options')
|
||||||
|
|
||||||
lifting_units = models.CharField(max_length=1, choices=UNITS, default='i')
|
lifting_units = models.CharField(max_length=1, choices=UNITS, default='i')
|
||||||
default_bar = models.ForeignKey(Bar)
|
default_bar = models.ForeignKey(Bar, default=1)
|
||||||
plate_pairs = ArrayField(models.DecimalField(max_digits=7, decimal_places=3),
|
plate_pairs = ArrayField(models.DecimalField(max_digits=7, decimal_places=3),
|
||||||
default=['45','45','25','10','5','5','2.5','1.25'])
|
default=['45','45','25','10','5','5','2.5','1.25'])
|
||||||
|
|
||||||
|
@ -6,14 +6,12 @@ import tempfile
|
|||||||
from collections import defaultdict, Counter
|
from collections import defaultdict, Counter
|
||||||
|
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from django import forms
|
|
||||||
from django.contrib.auth.decorators import login_required
|
from django.contrib.auth.decorators import login_required
|
||||||
from django.views.generic import dates
|
from django.views.generic import dates
|
||||||
from django.db.models import Count, Max
|
from django.db.models import Count, Max
|
||||||
|
|
||||||
from inventory.models import Lift, Bar
|
from inventory.models import Lift, Bar
|
||||||
from .models import Set
|
from .models import Set
|
||||||
from .forms import LiftingOptionsForm
|
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
|
Loading…
Reference in New Issue
Block a user