diff --git a/database/database.py b/database/database.py index 635677a7107c782c42216a16d01926b6d70828b6..68347600947762e7a1ae0fa8dada8a88598bc310 100644 --- a/database/database.py +++ b/database/database.py @@ -43,6 +43,12 @@ class VizData(mongo.Document): percentage = mongo.FloatField() categories = mongo.ListField(mongo.StringField(), default=[]) detail = mongo.StringField() + + def __eq__(self, other): + return self.id == other.id + + def __str__(self): + return "name : " + str(self.name) + " level : " + str(self.level) + " value : " + str(self.value) + " year : " + str(self.year) + " subdata : " + str(self.subdata) class Page(mongo.Document): level = mongo.IntField(required=True) diff --git a/modules/admin.py b/modules/admin.py index 1d1588ce616714e8a59262fb05b6c6a397415496..e8af714c4d59c5ac4ccd4228c93ed0a314f26305 100644 --- a/modules/admin.py +++ b/modules/admin.py @@ -30,8 +30,16 @@ def remove_page(): data = request.get_json() admin = db.User.objects.with_id(data.get("admin_id")) - admin.update(pull__page_list = db.VizData.objects.with_id(data.get("page_id"))) + # admin.update(pull__page_list = db.VizData.objects.with_id(data.get("page_id"))) + page = db.VizData.objects.with_id(data.get("page_id")) + idx = -1 + for i in range(len(admin.page_list)): + if (page == admin.page_list[i]): + idx = i + + admin.page_list.pop(idx) + admin.save() return jsonify({ "status":200, "message":"Page removed"