Update Editor profile

web/project/api/dashboards.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from flask import json, jsonify, request, Blueprint, flash
-from flask_security import auth_token_required, http_auth_required, login_required
+from flask_security import auth_token_required, http_auth_required, login_required, current_user
 from ..models import db, Dashboards
 from flask_principal import Permission, RoleNeed
+from mongoengine.queryset import Q
 
 
 dashboard_api = Blueprint('dashboard_api', __name__, url_prefix='/api/pulse/dashboards')
@@ -16,7 +17,14 @@
 @dashboard_api.route('', methods=['GET'])
 @dashboard_api.route('/', methods=['GET'])
 def get_dashboards_api():
-    dashboards = Dashboards.objects.all()
+    if current_user.has_role('admin'):
+        dashboards = Dashboards.objects.all().order_by('-pub_date')
+    elif current_user.has_role('editor'):
+        dashboards = Dashboards.objects(Q(status='public') | Q(contributor=current_user.email)).order_by(
+            '-pub_date')
+    else:
+        dashboards = Dashboards.objects(Q(status='public')).order_by('-pub_date')
+
     return jsonify({'result': dashboards})
 
 

web/project/api/templates.py

@@ -2,8 +2,10 @@
 
 from flask_principal import Permission, RoleNeed
 from flask import json, jsonify, request, Blueprint, flash
-from flask_security import auth_token_required, http_auth_required, login_required
+from flask_security import auth_token_required, http_auth_required, login_required, current_user
 from ..models import db, Templates
+from mongoengine.queryset import Q
+
 
 
 temp_api = Blueprint('template_api', __name__, url_prefix='/api/pulse/templates')
@@ -16,7 +18,13 @@
 @temp_api.route('', methods=['GET'])
 @temp_api.route('/', methods=['GET'])
 def get_templates_api():
-    templates = Templates.objects.all()
+    if current_user.has_role('admin'):
+        templates = Templates.objects.all().order_by('-pub_date')
+    elif current_user.has_role('editor'):
+        templates = Templates.objects(Q(status='public') | Q(contributor=current_user.email)).order_by(
+            '-pub_date')
+    else:
+        templates = Templates.objects(Q(status='public')).order_by('-pub_date')
     return jsonify({'result': templates})
 
 

web/project/api/visualizations.py

@@ -4,7 +4,7 @@
 from flask import json, jsonify, request, Blueprint, flash
 from flask_security import auth_token_required, http_auth_required, login_required, current_user
 from ..models import db, Visualizations
-from mongoengine.queryset.visitor import Q
+from mongoengine.queryset import Q
 
 
 viz_api = Blueprint('visualization_api', __name__, url_prefix='/api/pulse/visualizations')
@@ -19,19 +19,18 @@
 @viz_api.route('/', methods=['GET'])
 def get_visualizations_api():
     if current_user.has_role('admin'):
-        visualizations = Visualizations.objects.all()
+        visualizations = Visualizations.objects.all().order_by('-pub_date')
+    elif current_user.has_role('editor'):
+        visualizations = Visualizations.objects(Q(status='public') | Q(contributor=current_user.email)).order_by(
+            '-pub_date')
     else:
-        #public_viz = Visualizations.objects.filter(status='draft')
-        visualizations = Visualizations.objects(Q(contributor='[email protected]') | Q(status='public')).order_by('-pub_date')
-        #visualizations = own_viz
-
+        visualizations = Visualizations.objects(Q(status='public')).order_by('-pub_date')
     return jsonify({'result': visualizations})
 
 
 @viz_api.route('/<name>', methods=['GET'])
 def get_visualization_api(name):
     visualization = Visualizations.objects.filter(name=name).first_or_404()
-    #visualization = Visualizations.objects.get_or_404(name=name)
     return jsonify({'result': visualization})