Updated code to reflect change in add_page view and template

shantanaBernados · Jan 7, 2014 · bddfa79 · bddfa79
1 parent c2b7742
commit bddfa79
Show file tree

Hide file tree

Showing 46 changed files with 27 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.rst b/README.rst
diff --git a/tango_with_django_project/manage.py b/tango_with_django_project/manage.py
diff --git a/tango_with_django_project/media/profile_images/sample_profile.jpg b/tango_with_django_project/media/profile_images/sample_profile.jpg
diff --git a/tango_with_django_project/media/rango.jpg b/tango_with_django_project/media/rango.jpg
diff --git a/tango_with_django_project/populate_rango.py b/tango_with_django_project/populate_rango.py
diff --git a/tango_with_django_project/rango/__init__.py b/tango_with_django_project/rango/__init__.py
diff --git a/tango_with_django_project/rango/admin.py b/tango_with_django_project/rango/admin.py
diff --git a/tango_with_django_project/rango/bing_search.py b/tango_with_django_project/rango/bing_search.py
diff --git a/tango_with_django_project/rango/forms.py b/tango_with_django_project/rango/forms.py
diff --git a/tango_with_django_project/rango/models.py b/tango_with_django_project/rango/models.py
diff --git a/tango_with_django_project/rango/tests.py b/tango_with_django_project/rango/tests.py
diff --git a/tango_with_django_project/rango/urls.py b/tango_with_django_project/rango/urls.py
diff --git a/tango_with_django_project/rango/views.py b/tango_with_django_project/rango/views.py
@@ -175,8 +175,13 @@ def add_page(request, category_name_url):
             page = form.save(commit=False)
 
             # Retrieve the associated Category object so we can add it.
-            cat = Category.objects.get(name=category_name)
-            page.category = cat
+            try:
+                cat = Category.objects.get(name=category_name)
+                page.category = cat
+            except Category.DoesNotExist:
+                return render_to_response( 'rango/add_page.html',
+                                          context_dict,
+                                          context)
 
             # Also, create a default value for the number of views.
             page.views = 0

diff --git a/tango_with_django_project/static/css/bootstrap-fluid-adj.css b/tango_with_django_project/static/css/bootstrap-fluid-adj.css
diff --git a/tango_with_django_project/static/css/bootstrap-responsive.css b/tango_with_django_project/static/css/bootstrap-responsive.css
diff --git a/tango_with_django_project/static/css/bootstrap-responsive.min.css b/tango_with_django_project/static/css/bootstrap-responsive.min.css
diff --git a/tango_with_django_project/static/css/bootstrap.css b/tango_with_django_project/static/css/bootstrap.css
diff --git a/tango_with_django_project/static/css/bootstrap.min.css b/tango_with_django_project/static/css/bootstrap.min.css
diff --git a/tango_with_django_project/static/img/glyphicons-halflings-white.png b/tango_with_django_project/static/img/glyphicons-halflings-white.png
diff --git a/tango_with_django_project/static/img/glyphicons-halflings.png b/tango_with_django_project/static/img/glyphicons-halflings.png
diff --git a/tango_with_django_project/static/img/twd.ico b/tango_with_django_project/static/img/twd.ico
diff --git a/tango_with_django_project/static/js/bootstrap.js b/tango_with_django_project/static/js/bootstrap.js
diff --git a/tango_with_django_project/static/js/bootstrap.min.js b/tango_with_django_project/static/js/bootstrap.min.js
diff --git a/tango_with_django_project/static/js/jquery-2.0.3.js b/tango_with_django_project/static/js/jquery-2.0.3.js
diff --git a/tango_with_django_project/static/js/jquery-2.0.3.min.js b/tango_with_django_project/static/js/jquery-2.0.3.min.js
diff --git a/tango_with_django_project/static/js/rango-ajax.js b/tango_with_django_project/static/js/rango-ajax.js
diff --git a/tango_with_django_project/static/rango.jpg b/tango_with_django_project/static/rango.jpg
diff --git a/tango_with_django_project/tango_with_django_project/__init__.py b/tango_with_django_project/tango_with_django_project/__init__.py
diff --git a/tango_with_django_project/tango_with_django_project/settings.py b/tango_with_django_project/tango_with_django_project/settings.py
diff --git a/tango_with_django_project/tango_with_django_project/urls.py b/tango_with_django_project/tango_with_django_project/urls.py
diff --git a/tango_with_django_project/tango_with_django_project/wsgi.py b/tango_with_django_project/tango_with_django_project/wsgi.py
diff --git a/tango_with_django_project/templates/rango/about.html b/tango_with_django_project/templates/rango/about.html
diff --git a/tango_with_django_project/templates/rango/add_category.html b/tango_with_django_project/templates/rango/add_category.html
diff --git a/tango_with_django_project/templates/rango/add_page.html b/tango_with_django_project/templates/rango/add_page.html
@@ -9,23 +9,26 @@ <h1>Add a Page</h1>
     <br/>
 
     <div class="container">
-
-
-        <form class="span6" id="page_form" method="post" action="/rango/category/{{category_name_url}}/add_page/">
-
-            {% csrf_token %}
-            {% for hidden in form.hidden_fields %}
-            {{ hidden }}
-            {% endfor %}
-
-            {% for field in form.visible_fields %}
-            {{ field.errors }}<br/>
-            {{ field.help_text}}
-            {{ field }}
-            {% endfor %}
-            <br/>
-            <input class="btn btn-primary" type="submit" name="submit" value="Create Page"/>
-        </form>
+
+		{% if not category_name_url %}
+			<div style="color: red;">The specified category does not exist!</div>
+		{% else %}
+        	<form class="span6" id="page_form" method="post" action="/rango/category/{{category_name_url}}/add_page/">
+
+            	{% csrf_token %}
+            	{% for hidden in form.hidden_fields %}
+            	{{ hidden }}
+            	{% endfor %}
+
+            	{% for field in form.visible_fields %}
+            	{{ field.errors }}<br/>
+            	{{ field.help_text}}
+            	{{ field }}
+            	{% endfor %}
+            	<br/>
+            	<input class="btn btn-primary" type="submit" name="submit" value="Create Page"/>
+        	</form>
+		{% endif %}
     </div>
 </div>
 {% endblock %}
diff --git a/tango_with_django_project/templates/rango/base.html b/tango_with_django_project/templates/rango/base.html
diff --git a/tango_with_django_project/templates/rango/category.html b/tango_with_django_project/templates/rango/category.html
diff --git a/tango_with_django_project/templates/rango/category_list.html b/tango_with_django_project/templates/rango/category_list.html
diff --git a/tango_with_django_project/templates/rango/index.html b/tango_with_django_project/templates/rango/index.html
diff --git a/tango_with_django_project/templates/rango/login.html b/tango_with_django_project/templates/rango/login.html
diff --git a/tango_with_django_project/templates/rango/page_list.html b/tango_with_django_project/templates/rango/page_list.html
diff --git a/tango_with_django_project/templates/rango/profile.html b/tango_with_django_project/templates/rango/profile.html
diff --git a/tango_with_django_project/templates/rango/register.html b/tango_with_django_project/templates/rango/register.html
diff --git a/tango_with_django_project/templates/rango/restricted.html b/tango_with_django_project/templates/rango/restricted.html
diff --git a/tango_with_django_project/templates/rango/search.html b/tango_with_django_project/templates/rango/search.html