diff --git a/spug_api/apps/app/views.py b/spug_api/apps/app/views.py index a5fc358..0571704 100644 --- a/spug_api/apps/app/views.py +++ b/spug_api/apps/app/views.py @@ -2,7 +2,7 @@ # Copyright: (c) # Released under the AGPL-3.0 License. from django.views.generic import View -from django.db.models import F +from django.db.models import F, Q from libs import JsonParser, Argument, json_response, auth from apps.app.models import App, Deploy, DeployExtend1, DeployExtend2 from apps.config.models import Config, ConfigHistory @@ -13,15 +13,15 @@ import re class AppView(View): - @auth('deploy.app.view|deploy.repository.view|deploy.request.view|config.app.view') def get(self, request): - query = {} - if not request.user.is_supper: - query['id__in'] = request.user.deploy_perms['apps'] - apps = App.objects.filter(**query) + if request.user.is_supper: + apps = App.objects.all() + else: + ids = request.user.deploy_perms['apps'] + apps = App.objects.filter(Q(id__in=ids) | Q(created_by=request.user)) return json_response(apps) - @auth('deploy.app.edit|config.app.add|config.app.edit') + @auth('deploy.app.add|deploy.app.edit|config.app.add|config.app.edit') def post(self, request): form, error = JsonParser( Argument('id', type=int, required=False), diff --git a/spug_api/apps/config/views.py b/spug_api/apps/config/views.py index c675bcf..64f69f1 100644 --- a/spug_api/apps/config/views.py +++ b/spug_api/apps/config/views.py @@ -11,7 +11,6 @@ import re class EnvironmentView(View): - @auth('deploy.repository.view|deploy.request.view|config.env.view') def get(self, request): query = {} if not request.user.is_supper: diff --git a/spug_web/src/pages/system/role/codes.js b/spug_web/src/pages/system/role/codes.js index d834c66..393c6de 100644 --- a/spug_web/src/pages/system/role/codes.js +++ b/spug_web/src/pages/system/role/codes.js @@ -62,7 +62,7 @@ export default [{ label: '应用管理', perms: [ {key: 'view', label: '查看应用'}, - // {key: 'add', label: '新建应用'}, + {key: 'add', label: '新建应用'}, {key: 'edit', label: '编辑应用'}, {key: 'del', label: '删除应用'}, {key: 'config', label: '查看配置'},