From d21aad24d5ff43de9ac5cade2253c064205aaa78 Mon Sep 17 00:00:00 2001 From: Karson Date: Wed, 31 May 2017 16:35:55 +0800 Subject: [PATCH] --- .../admin/controller/general/Attachment.php | 115 +----------------- application/common/controller/Backend.php | 2 - 2 files changed, 2 insertions(+), 115 deletions(-) diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index 0207fe52..cb549ffd 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -59,21 +59,7 @@ class Attachment extends Backend { if ($this->request->isAjax()) { - list($where, $sort, $order, $offset, $limit) = $this->buildparams(); - $total = $this->model - ->where($where) - ->order($sort, $order) - ->count(); - - $list = $this->model - ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) - ->select(); - - $result = array("total" => $total, "rows" => $list); - - return json($result); + return $this->index(); } return $this->view->fetch(); } @@ -83,108 +69,11 @@ class Attachment extends Backend */ public function add() { - if ($this->request->isPost()) + if ($this->request->isAjax()) { $this->code = -1; - $params = $this->request->post("row/a"); - if ($params) - { - if ($this->request->has('field')) - { - //JSON字段 - $fieldarr = $valuearr = []; - $field = $this->request->post('field/a'); - $value = $this->request->post('value/a'); - foreach ($field as $k => $v) - { - if ($v != '') - { - $fieldarr[] = $field[$k]; - $valuearr[] = $value[$k]; - } - } - $params['content'] = array_combine($fieldarr, $valuearr); - } - $this->model->save($params); - $this->code = 1; - } - - return; } return $this->view->fetch(); } - /** - * 编辑 - */ - public function edit($ids = NULL) - { - $row = $this->model->get(['id' => $ids]); - if (!$row) - $this->error(__('No Results were found')); - if ($this->request->isPost()) - { - $this->code = -1; - $params = $this->request->post("row/a"); - if ($params) - { - $row->save($params); - $this->code = 1; - } - - return; - } - $this->view->assign("row", $row); - return $this->view->fetch(); - } - - /** - * 删除 - */ - public function del($ids = "") - { - $this->code = -1; - if ($ids) - { - $count = $this->model->where('id', 'in', $ids)->delete(); - if ($count) - { - $this->code = 1; - } - } - - return; - } - - /** - * 批量更新 - */ - public function multi($ids = "") - { - $this->code = -1; - $ids = $ids ? $ids : $this->request->param("ids"); - if ($ids) - { - if ($this->request->has('params')) - { - parse_str($this->request->post("params"), $values); - $values = array_intersect_key($values, array_flip(array('status'))); - if ($values) - { - $count = $this->model->where('id', 'in', $ids)->update($values); - if ($count) - { - $this->code = 1; - } - } - } - else - { - $this->code = 1; - } - } - - return; - } - } diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index 6dff0b62..198e247e 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -117,8 +117,6 @@ class Backend extends Controller if (!$this->auth->match($this->noNeedRight)) { // 判断控制器和方法判断是否有对应权限 - $path = str_replace('.', '/', $this->request->path()); - $path = substr($path, 0, 1) == '/' ? $path : '/' . $path; if (!$this->auth->check($path)) { $this->error(__('You have no permission'), NULL);