From d479d9fbcb37f8b861031c94a83d0e37761210c5 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Tue, 29 May 2018 09:07:03 +0800
Subject: [PATCH] 修改bug
---
application/modules/User/controllers/User.php | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php
index 705a07a..c3aaa47 100644
--- a/application/modules/User/controllers/User.php
+++ b/application/modules/User/controllers/User.php
@@ -14,9 +14,11 @@
if($this->getRequest()->isXmlHttpRequest()){
$total = $this->user_service->getUserListTotal();
$data['draw'] = !empty($_REQUEST['draw'])?$_REQUEST['draw']:1;
+ $data['start'] = !empty($_REQUEST['start'])?$_REQUEST['start']:0;
+ $data['length'] = !empty($_REQUEST['length'])?$_REQUEST['length']:10;
$data['recordsTotal'] = $total;
$data['recordsFiltered'] = $total;
- $data['data'] = $this->user_service->getUserList();
+ $data['data'] = $this->user_service->getUserList(array(), array(), array(), $data['length'], $data['start']);
exit($this->sendToDataTable($data));
}
}
@@ -47,7 +49,7 @@
exit($this->showError($this->user_service->error, 400, true));
}
}
- $role_service = new service_Role();
+ $role_service = new Service_Role();
$roles = $role_service->getRoleList();
$this->getView()->assign('roles', $roles);
}
@@ -86,6 +88,38 @@
}
/**
+ * ������������������
+ */
+ public function MyAction(){
+ $user_id = $this->session['user']['user_id'];
+ $user = $this->user_service->getUserInfo(array('_id' => $user_id));
+ if($user){
+ if($this->getRequest()->isXmlHttpRequest()){
+ $data['nickname'] = $this->post('nickname');
+ $password = $this->post('password');
+ if(!empty($password))
+ $data['password'] = md5(md5($password).$user['encrypt']);
+ $data['refresh_frequency'] = $this->post('refresh_frequency');
+ $data['is_open_upload'] = $this->post('is_open_upload');
+ $data['video'] = $this->post('video');
+ $data['edit_time'] = time();
+ if($this->user_service->update($data, array('_id' => $user_id))){
+ exit($this->showSuccess('������������������', true));
+ }
+ else{
+ exit($this->showError($this->user_service->error, 400, true));
+ }
+ }
+ $role_service = new Service_Role();
+ $roles = $role_service->getRoleList();
+ $this->getView()->assign(array('user' => $user, 'roles' => $roles));
+ }
+ else{
+ $this->redirect('/error/show/type/no_data');
+ }
+ }
+
+ /**
* ������������������������������
*/
public function CheckPhoneAction(){
--
Gitblit v1.8.0