Fixed merge conflicts.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/web/models/category.py b/src/web/models/category.py
index 78054809..c35db52e 100644
--- a/src/web/models/category.py
+++ b/src/web/models/category.py
@@ -1,11 +1,21 @@
 from bootstrap import db
+from sqlalchemy import Index
+from web.models.right_mixin import RightMixin
 
 
-class Category(db.Model):
+class Category(db.Model, RightMixin):
     id = db.Column(db.Integer(), primary_key=True)
     name = db.Column(db.String())
 
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
 
-    def dump(self):
-        return {key: getattr(self, key) for key in ('id', 'name', 'user_id')}
+    idx_category_uid = Index('user_id')
+
+    # api whitelists
+    @staticmethod
+    def _fields_base_read():
+        return {'id', 'user_id'}
+
+    @staticmethod
+    def _fields_base_write():
+        return {'name'}