Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加下载的权限(hhyo#1367) #1369

Merged
merged 5 commits into from
Feb 12, 2022
Merged

增加下载的权限(hhyo#1367) #1369

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7815df
增加下载的权限(hhyo#1367)
weideguo Feb 8, 2022
2019bcb
修复拼写错误
weideguo Feb 9, 2022
cceb15b
补加SQL文件
weideguo Feb 9, 2022
de67a2c
变量名修改以及其他优化
weideguo Feb 9, 2022
c8f5a31
权限名修改
weideguo Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sql/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,7 @@ class Meta:
('archive_review', '审核归档申请'),
('archive_mgt', '管理归档申请'),
('audit_user','审计权限'),
('download', '在线查询下载权限'),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

query_download ,你觉得这个名字怎么样

)


Expand Down
2 changes: 1 addition & 1 deletion sql/templates/group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
}],
onLoadSuccess: function () {
},
onLoadError: fonLoadErrorCallback,
onLoadError: onLoadErrorCallback,
onSearch: function (e) {
//传搜索参数给服务器
queryParams(e)
Expand Down
6 changes: 4 additions & 2 deletions sql/templates/sqlquery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
<script>
//获取查询列表
function get_querylog(query_log_id) {
var showExport = {{is_download}}==1
//初始化table
$('#sql-log').bootstrapTable('destroy').bootstrapTable({
escape: true,
Expand All @@ -280,7 +281,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
pageNumber: 1, //初始化加载第一页，默认第一页,并记录
pageSize: 14, //每页的记录行数（*）
pageList: [10, 30, 50, 100], //可供选择的每页的行数（*）
showExport: true, //是否显示导出按钮
showExport: showExport, //是否显示导出按钮
exportTypes: ['json', 'sql', 'csv', 'txt', 'xml', 'xlsx'],
exportOptions: {
ignoreColumn: [0], //忽略某些列的索引数组
Expand Down Expand Up @@ -781,11 +782,12 @@ <h4 class="modal-title text-danger">收藏语句</h4>
if (optgroup == 'Mongo') {
isdetail = true
}
var showExport = {{is_download}}==1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

三个等于号？

$("#" + ('query_result' + n)).bootstrapTable('destroy').bootstrapTable({
escape: true,
data: result['rows'],
columns: columns,
showExport: true,
showExport: showExport,
exportDataType: "all",
exportTypes: ['json', 'sql', 'csv', 'txt', 'xml', 'xlsx'],
exportOptions: {
Expand Down
3 changes: 2 additions & 1 deletion sql/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 更精准一点

return render(request, 'sqlquery.html', {'favorites': favorites, 'is_download':is_download})


@permission_required('sql.menu_queryapplylist', raise_exception=True)
Expand Down
7 changes: 6 additions & 1 deletion src/init_sql/v1.8.3.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@ alter table audit_log add `user_display` varchar(50) DEFAULT NULL COMMENT '用

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
('审计权限 ', @content_type_id, 'audit_user');
('审计权限', @content_type_id, 'audit_user');

-- 在线查询下载权限
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
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

建议逻辑保持一致，给默认用户组授予权限，不需要的可以主动剔除

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

-- 默认组拥有在线查询下载权限
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';

添加这样语句？

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

对，不过也不一定用户都是用的这个默认组，不好确认，后续这边在release note中说明下好了

('在线查询下载权限', @content_type_id, 'download');