diff --git a/projects/forms.py b/projects/forms.py index ebeb6e5..41cd1fb 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -182,7 +182,7 @@ class RealtyForm(forms.ModelForm): class PortfolioForm(forms.ModelForm): - duplicate = forms.BooleanField(required=False,label='Some label here') + duplicate = forms.BooleanField(required=False, label='Some label here') images_ids = forms.CharField(required=True) class Meta: diff --git a/projects/models.py b/projects/models.py index 4ab5b59..cfedcda 100644 --- a/projects/models.py +++ b/projects/models.py @@ -287,7 +287,7 @@ class Portfolio(models.Model): budget = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True) building_classification = models.ForeignKey(BuildingClassfication, related_name='portfolios', null=True, blank=True) construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True) - created = models.DateTimeField(default=timezone.now) + created = models.DateTimeField(default=timezone.now, auto_now_add=True, auto_created=True) currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True) description = models.TextField() location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True) @@ -297,19 +297,19 @@ class Portfolio(models.Model): term_type = models.CharField(max_length=20, choices=TERMS, default='hour', null=True, blank=True) user = models.ForeignKey(User, related_name='portfolios', null=True, blank=True) worksell = models.BooleanField(default=False) - + def __str__(self): return self.name def get_prev(self): try: - return self.get_previous_by_created() + return self.get_previous_by_created(user=self.user) except self.DoesNotExist: return None def get_next(self): try: - return self.get_next_by_created() + return self.get_next_by_created(user=self.user) except self.DoesNotExist: return None diff --git a/templates/partials/footer.html b/templates/partials/footer.html index 39583e9..b29df6b 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -19,6 +19,7 @@

Профиль

diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html index 9bf6121..9879f71 100644 --- a/users/templates/contractor_filter.html +++ b/users/templates/contractor_filter.html @@ -142,7 +142,7 @@ type="submit" name="{{ form.party_types.html_name }}" value="{{ val }}" - class="{% if val == last_party_types %}active{% endif %} btn btn-default"> + class="{% if val == last_party_types or not last_party_types and val == 'all' %}active{% endif %} btn btn-default"> {{ text }} {% endfor %} diff --git a/work_sell/models.py b/work_sell/models.py index b2a6f68..b9f7d22 100644 --- a/work_sell/models.py +++ b/work_sell/models.py @@ -16,8 +16,8 @@ class WorkSell(models.Model): budget = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True) building_classification = models.ForeignKey(BuildingClassfication, related_name='worksells', null=True, blank=True) construction_type = models.ForeignKey(ConstructionType, related_name='worksells', null=True, blank=True) - contractor = models.ForeignKey(User, related_name='work_sell', null=True, blank=True) # TODO: Pluralize related name - created = models.DateTimeField(default=timezone.now) + contractor = models.ForeignKey(User, related_name='work_sell', null=True, blank=True) # TODO: Pluralize related name + created = models.DateTimeField(default=timezone.now, auto_now_add=True) currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True) description = models.TextField(blank=True) location = TreeForeignKey('common.Location', related_name='worksells', null=True, blank=True) @@ -35,13 +35,13 @@ class WorkSell(models.Model): def get_prev(self): try: - return self.get_previous_by_created() + return self.get_previous_by_created(contractor=self.contractor) except self.DoesNotExist: return None def get_next(self): try: - return self.get_next_by_created() + return self.get_next_by_created(contractor=self.contractor) except self.DoesNotExist: return None