Skip to content

Commit

Permalink
Merge pull request #86 from hyj1991/auth_admin_bug_fix
Browse files Browse the repository at this point in the history
fix: admin info resave error
  • Loading branch information
hyj1991 committed Sep 25, 2018
2 parents 5dbded4 + 6701366 commit cacd072
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 33 deletions.
7 changes: 1 addition & 6 deletions src_logic/dashboard/public/dist/0.chunk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src_logic/dashboard/public/dist/1.chunk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src_logic/dashboard/public/dist/2.chunk.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src_logic/dashboard/public/dist/main.css

Large diffs are not rendered by default.

22 changes: 2 additions & 20 deletions src_logic/dashboard/public/dist/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src_logic/dashboard/public/dist/vendors.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src_view/src/javascript/dynamic.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ function fetchConfig(data, cb) {
vm.authNeed = Boolean(auth.need);
vm.authNeedDisable = auth.disable.need;
vm.adminList = Array.isArray(auth.admin) && auth.admin || [];
vm.rawAdmin = auth.admin;
vm.normalList = Array.isArray(auth.project_auth) && auth.project_auth || [];
}

Expand Down Expand Up @@ -169,7 +170,7 @@ function axiosFetch(type, cb) {

//设置修改后的 auth 配置
data.auth = {
admin: this.adminList,
admin: this.rawAdmin === false ? false : this.adminList,
project_auth: this.normalList
}

Expand Down

0 comments on commit cacd072

Please sign in to comment.