From ffa1ca678332bc5c6418d685f523367380bd72cc Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 12 Apr 2016 11:43:38 +1000
Subject: [PATCH] Fixes flags admin

---
 registrasion/admin.py                 |  4 ++--
 registrasion/migrations/0022_merge.py | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 registrasion/migrations/0022_merge.py

diff --git a/registrasion/admin.py b/registrasion/admin.py
index 7065b0a2..ff9b0ec4 100644
--- a/registrasion/admin.py
+++ b/registrasion/admin.py
@@ -151,7 +151,7 @@ class ProductFlagAdmin(
         return list(obj.enabling_products.all())
 
     model = rego.ProductFlag
-    fields = ("description", "enabling_products", "mandatory", "products",
+    fields = ("description", "enabling_products", "condition", "products",
               "categories"),
 
     list_display = ("description", "enablers", "effects")
@@ -164,7 +164,7 @@ class CategoryFlagAdmin(
         EffectsDisplayMixin):
 
     model = rego.CategoryFlag
-    fields = ("description", "enabling_category", "mandatory", "products",
+    fields = ("description", "enabling_category", "condition", "products",
               "categories"),
 
     list_display = ("description", "enabling_category", "effects")
diff --git a/registrasion/migrations/0022_merge.py b/registrasion/migrations/0022_merge.py
new file mode 100644
index 00000000..e3c30039
--- /dev/null
+++ b/registrasion/migrations/0022_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-04-12 01:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('registrasion', '0021_auto_20160411_0748_squashed_0024_auto_20160411_2230'),
+        ('registrasion', '0021_auto_20160411_0820'),
+    ]
+
+    operations = [
+    ]