mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复在分层控制器下的权限验证错误 

修复表单在提交后未返回token时导致的客户端错误
pull/323483/MERGE
Karson 2017-05-31 16:13:14 +08:00
parent 58edcba995
commit bcb48fcfed
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/common/controller/Backend.php
View File

@ -117,7 +117,7 @@ class Backend extends Controller
if (!$this->auth->match($this->noNeedRight)) if (!$this->auth->match($this->noNeedRight))
{ {
// 判断控制器和方法判断是否有对应权限 // 判断控制器和方法判断是否有对应权限
$path = $this->request->path(); $path = str_replace('.', '/', $this->request->path());
$path = substr($path, 0, 1) == '/' ? $path : '/' . $path; $path = substr($path, 0, 1) == '/' ? $path : '/' . $path;
if (!$this->auth->check($path)) if (!$this->auth->check($path))
{ {

2
public/assets/js/require-form.js
View File

@ -51,7 +51,7 @@ define(['jquery', 'bootstrap', 'backend', 'toastr', 'upload', 'validator'], func
} }
Toastr.success(msg ? msg : __('Operation completed')); Toastr.success(msg ? msg : __('Operation completed'));
} else { } else {
if (typeof data.token !== 'undefined') { if (data && typeof data === 'object' && typeof data.token !== 'undefined') {
$("input[name='__token__']").val(data.token); $("input[name='__token__']").val(data.token);
} }
Toastr.error(msg ? msg : __('Operation failed')); Toastr.error(msg ? msg : __('Operation failed'));