增加下载的权限(hhyo#1367) #1369
Merged
增加下载的权限(hhyo#1367) #1369
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #1369 +/- ##
=======================================
Coverage 75.39% 75.39%
=======================================
Files 81 81
Lines 12616 12616
=======================================
Hits 9512 9512
Misses 3104 3104
Continue to review full report at Codecov.
|
LeoQuote
requested changes
Feb 9, 2022
sql/views.py
Outdated
| @@ -220,7 +220,8 @@ def sqlquery(request): | |||
| # 收藏语句 | |||
| user = request.user | |||
| favorites = QueryLog.objects.filter(username=user.username, favorite=True).values('id', 'alias') | |||
| return render(request, 'sqlquery.html', {'favorites': favorites}) | |||
| is_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0 | |||
There was a problem hiding this comment.
Suggested change
| is_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0 | |
| can_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0 |
变量改成 can_download 更精准一点
sql/templates/sqlquery.html
Outdated
| @@ -781,11 +782,12 @@ <h4 class="modal-title text-danger">收藏语句</h4> | |||
| if (optgroup == 'Mongo') { | |||
| isdetail = true | |||
| } | |||
| var showExport = {{is_download}}==1 | |||
LeoQuote
reviewed
Feb 9, 2022
sql/models.py
Outdated
| @@ -730,6 +730,7 @@ class Meta: | |||
| ('archive_review', '审核归档申请'), | |||
| ('archive_mgt', '管理归档申请'), | |||
| ('audit_user','审计权限'), | |||
| ('download', '在线查询下载权限'), | |||
There was a problem hiding this comment.
query_download ,你觉得这个名字怎么样
hhyo
reviewed
Feb 10, 2022
|
|
||
| -- 在线查询下载权限 | ||
| set @content_type_id=(select id from django_content_type where app_label='sql' and model='permission'); | ||
| insert IGNORE INTO auth_permission (name, content_type_id, codename) VALUES |
There was a problem hiding this comment.
-- 默认组拥有在线查询下载权限
insert into auth_group_permissions (group_id, permission_id) select 1,id from auth_permission where
name='在线查询下载权限' and content_type_id=@content_type_id and codename='query_download';添加这样语句？
There was a problem hiding this comment.
对，不过也不一定用户都是用的这个默认组，不好确认，后续这边在release note中说明下好了
|
大佬666 |
hhyo
approved these changes
Feb 12, 2022
hhyo
reviewed
Mar 30, 2022
| @@ -220,7 +220,8 @@ def sqlquery(request): | |||
| # 收藏语句 | |||
| user = request.user | |||
| favorites = QueryLog.objects.filter(username=user.username, favorite=True).values('id', 'alias') | |||
| return render(request, 'sqlquery.html', {'favorites': favorites}) | |||
| can_download = 1 if user.has_perm('sql.download') or user.is_superuser else 0 | |||
| return render(request, 'sqlquery.html', {'favorites': favorites, 'can_download':can_download}) | |||
There was a problem hiding this comment.
这里需要调整下，判断的download，写入的定义是query_download😬
Merged
|
很需要这个权限控制。感谢。 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
虽然限制前端的下载功能没有什么实质的意义，但似乎有人有这要求。