Merge branch 'master' of https://github.com/mogujie/TeamTalk

php/.gitignore

@@ -0,0 +1 @@
+php/download/*

php/application/controllers/user.php

@@ -94,14 +94,18 @@ public function add()
 
 	public function edit()
 	{
+		$avatar = $this->input->post('avatar');
+		if(strpos($avatar, $this->config->config['msfs_url']) === false){
+			$avatar = $this->config->config['msfs_url'].$this->input->post('avatar');
+		}
 		$params = array(
 			'sex'=>$this->input->post('sex'),
 			'name'=>$this->input->post('name'),
 			'domain'=>$this->input->post('domain'),
 			'nick'=>$this->input->post('nick'),
 			'phone'=>$this->input->post('phone'),
 			'email'=>$this->input->post('email'),
-			'avatar'=>$this->config->config['msfs_url'].$this->input->post('avatar'),
+			'avatar'=>$avatar,
 			'departId'=>$this->input->post('departId'),
 			'status'=>$this->input->post('status'),
 			'updated'=>time()

php/application/views/base/user.php

@@ -141,6 +141,7 @@
                     id:node.data('id')
                 }, function(data) {
                     var data = JSON.parse(data);
+                    console.log(data);
                     $("#radio"+data.sex).attr("checked","checked");
                     $(".name").val(data.name);
                     $(".nick").val(data.nick);
@@ -150,7 +151,7 @@
                     if(data.avatar){
                         $(".avatar_show").attr("src",data.avatar).removeClass("hide");
                     }
-                    $(".depart").val(data.depart);
+                    $(".departId").val(data.departId);
                     $(".btn-margin").addClass("btn-margin-edit");
                     $(".btn-margin-edit").data('id',node.data('id'));