diff --git a/application/admin/common.php b/application/admin/common.php index 7c13b028..705cba8e 100644 --- a/application/admin/common.php +++ b/application/admin/common.php @@ -89,7 +89,7 @@ function build_category_select($name, $type, $selected = null, $attr = [], $head function build_toolbar($btns = NULL, $attr = []) { $auth = \app\admin\library\Auth::instance(); - $controller = strtolower(think\Request::instance()->controller()); + $controller = str_replace('.','/',strtolower(think\Request::instance()->controller())); $btns = $btns ? $btns : ['refresh', 'add', 'edit', 'del']; $btns = is_array($btns) ? $btns : explode(',', $btns); $index = array_search('delete', $btns); diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php index 803c7be5..de368e0e 100644 --- a/application/admin/controller/Addon.php +++ b/application/admin/controller/Addon.php @@ -196,6 +196,8 @@ class Addon extends Backend */ public function local() { + Config::set('default_return_type', 'json'); + $file = $this->request->file('file'); $addonTmpDir = RUNTIME_PATH . 'addons' . DS; if (!is_dir($addonTmpDir)) diff --git a/application/admin/view/auth/admin/index.html b/application/admin/view/auth/admin/index.html index 9e3f7940..b4ed2565 100644 --- a/application/admin/view/auth/admin/index.html +++ b/application/admin/view/auth/admin/index.html @@ -8,11 +8,11 @@
{:build_toolbar('refresh,add,delete')}
- - +
- - diff --git a/application/admin/view/auth/adminlog/index.html b/application/admin/view/auth/adminlog/index.html index 8d61a3a5..e0a711f6 100644 --- a/application/admin/view/auth/adminlog/index.html +++ b/application/admin/view/auth/adminlog/index.html @@ -8,11 +8,11 @@
{:build_toolbar('refresh,delete')}
- - +
- - diff --git a/application/admin/view/auth/group/index.html b/application/admin/view/auth/group/index.html index 327313d8..9ad38482 100644 --- a/application/admin/view/auth/group/index.html +++ b/application/admin/view/auth/group/index.html @@ -8,8 +8,10 @@
{:build_toolbar('refresh,add,delete')}
- - +
diff --git a/application/admin/view/auth/rule/index.html b/application/admin/view/auth/rule/index.html index 0d6331f4..667de5dc 100644 --- a/application/admin/view/auth/rule/index.html +++ b/application/admin/view/auth/rule/index.html @@ -9,8 +9,10 @@ {:build_toolbar()} {:__('Toggle all')} - - +
diff --git a/application/admin/view/category/index.html b/application/admin/view/category/index.html index d3eefa4f..3c07c85b 100644 --- a/application/admin/view/category/index.html +++ b/application/admin/view/category/index.html @@ -7,7 +7,7 @@
{:build_toolbar()} - - +
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html index 36cf2e70..c7c97677 100644 --- a/application/index/view/index/index.html +++ b/application/index/view/index/index.html @@ -13,7 +13,7 @@ - + @@ -34,7 +34,7 @@ - +