finish feature #26

backend/controllers/UserController.php

@@ -105,7 +105,6 @@ class UserController extends Controller
      */
     public function actionDelete($id)
     {
-//         $this->findModel($id)->delete();
 
     	$user = $this->findModel($id);
     	

backend/models/UserSearch.php

@@ -46,6 +46,8 @@ class UserSearch extends User
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
+        
+        $query->andWhere(['status' => User::STATUS_ACTIVE]);
 
         $this->load($params);
 
@@ -54,6 +56,8 @@ class UserSearch extends User
             // $query->where('0=1');
             return $dataProvider;
         }
+        
+        
 
         $query->andFilterWhere([
             'id' => $this->id,

common/models/User.php

@@ -201,4 +201,12 @@ class User extends ActiveRecord implements IdentityInterface
     	}
     	return $result;
     }
+    
+    
+    public function attributeLabels(){
+    	return [
+    			
+    	];
+    }
+    
 }