remotes/origin/PR-39
PekopT 10 years ago
parent 46d8c5cb73
commit f055e4c4ff
  1. 2
      projects/models.py
  2. 4
      projects/templates/portfolio_detail.html
  3. 4
      work_sell/templates/worksell_detail.html

@ -290,7 +290,7 @@ class Portfolio(models.Model):
construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True) construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True)
created = models.DateTimeField(auto_now_add=True, auto_created=True) created = models.DateTimeField(auto_now_add=True, auto_created=True)
currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True) currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True)
description = models.TextField() description = models.TextField(blank=True)
location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True) location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True)
name = models.CharField(max_length=255) name = models.CharField(max_length=255)
specialization = TreeForeignKey(Specialization, related_name='portfolios', null=True, blank=True) specialization = TreeForeignKey(Specialization, related_name='portfolios', null=True, blank=True)

@ -47,13 +47,13 @@
<div class="desReadyBlock"> <div class="desReadyBlock">
{% if object.text %} {% if object.description %}
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="titleReady">Описание:</p> <p class="titleReady">Описание:</p>
</div> </div>
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="textReady"> <p class="textReady">
{{ object.text }} {{ object.description }}
</p> </p>
</div> </div>
{% endif %} {% endif %}

@ -48,13 +48,13 @@
<div class="desReadyBlock"> <div class="desReadyBlock">
{% if object.text %} {% if object.description %}
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="titleReady">Описание:</p> <p class="titleReady">Описание:</p>
</div> </div>
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="textReady"> <p class="textReady">
{{ object.text }} {{ object.description }}
</p> </p>
</div> </div>
{% endif %} {% endif %}

Loading…
Cancel
Save