Skip to content

Commit

Permalink
* Update the categories form to show error messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
bgroff committed Dec 19, 2017
1 parent 5bc3700 commit e5be69e
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 6 deletions.
3 changes: 1 addition & 2 deletions django_kala/projects/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from django.conf import settings
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Permission
from django.core.exceptions import ObjectDoesNotExist
from django.db import models
from django_kala.managers import ActiveManager
from taggit.managers import TaggableManager
Expand Down Expand Up @@ -135,7 +134,7 @@ def has_create(self, user):
class Category(models.Model):
name = models.CharField(max_length=255)
project = models.ForeignKey(Project)
type = models.CharField(max_length=20, db_index=True, null=True, blank=True)
type = models.CharField(max_length=20, db_index=True, blank=True)

def __str__(self):
return '{0}'.format(self.name)
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,32 @@
<div class="item">
<div class="header">Categories</div>
<div class="menu">
<a class="item" href="{% url 'projects:categories' project.pk %}">Manage categories</a>
<a class="active item" href="{% url 'projects:new_category' project.pk %}">New category</a>
<a class="active item" href="{% url 'projects:categories' project.pk %}">Manage categories</a>
<a class="item" href="{% url 'projects:new_category' project.pk %}">New category</a>
</div>
</div>
</div>
</div>
<div class="twelve wide column">
<form class="ui form" method="post">
<form class="ui form {% if form.errors %}error{% endif %}" method="post">
{% csrf_token %}
<div class="field">
<label>{{ form.name.label }}</label>
<input id={{ form.name.auto_id }} type="text" name="{{ form.name.name }}" placeholder="Category Name" value="{{ form.name.value }}" maxlength="{{ form.fields.name.max_length }} required">
</div>
<div class="ui error message">
<ul class="list">
{% for error in form.name.errors %}
<li>
{{ error }}
</li>
{% empty %}
<li>
Could not create category.
</li>
{% endfor %}
</ul>
</div>
<div class="field">
<label>{{ form.type.label }}</label>
{{ form.type }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,25 @@
</div>
</div>
<div class="twelve wide column">
<form class="ui form" method="post">
<form class="ui form {% if form.errors %}error{% endif %}" method="post">
{% csrf_token %}
<div class="field">
<label>{{ form.name.label }}</label>
<input id={{ form.name.auto_id }} type="text" name="{{ form.name.name }}" placeholder="Category Name" maxlength="{{ form.fields.name.max_length }} required">
</div>
<div class="ui error message">
<ul class="list">
{% for error in form.name.errors %}
<li>
{{ error }}
</li>
{% empty %}
<li>
Could not create category.
</li>
{% endfor %}
</ul>
</div>
<div class="field">
<label>{{ form.type.label }}</label>
{{ form.type }}
Expand Down

0 comments on commit e5be69e

Please sign in to comment.