mirror of https://github.com/openspug/spug
A 添加角色的新建应用功能权限
parent
82696c8770
commit
9ac14e2f9e
|
@ -2,7 +2,7 @@
|
|||
# Copyright: (c) <spug.dev@gmail.com>
|
||||
# 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),
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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: '查看配置'},
|
||||
|
|
Loading…
Reference in New Issue