Changeset 771

Timestamp:

Mar 2, 2015 12:48:54 PM (10 years ago)

Author:

quyenla

Message:

admin roles

Location:

pro-violet-viettel/sourcecode/application/modules

Files:

• admin/controllers/reportprovince.php (modified) (1 diff)
• ajax/controllers/privatecontent.php (modified) (2 diffs)
• frontend/controllers/user.php (modified) (1 diff)

pro-violet-viettel/sourcecode/application/modules/admin/controllers/reportprovince.php

@@ -102 +102 @@
         $writer->save('php://output');
     }
-    
+    public function test()
+    {
+        $input['date']=1;
+        $input['month']=1;
+        $input['year']=2014;
+        $input['to_month']=1;
+        $input['to_year']=2015;
+        $input['to_date']=15;
+        $data=$this->reportmodel->exportPackage($input);
+        echo "<pre>";
+        print_r ($data);
+        echo "</pre>";
+    }
 }

pro-violet-viettel/sourcecode/application/modules/ajax/controllers/privatecontent.php

@@ -39 +39 @@
         
         public function getContent () {
-                $xmlData = $this->vservices->getPrivateTree();
- 
-                $this->xml->parse($xmlData);
+                $xmlData = $this->vservices->getPrivateTree(); 
+                //echo $xmlData;die();
+                $this->xml->parse($xmlData);
                 
                 $aryDirs = array();
@@ -71 +71 @@
                         if (is_array($this->xml->tree->filelist->file)) {
                                 foreach($this->xml->tree->filelist->file as $key=>$value){
-                                        $aryFiles[] = array('id' => $value->_param['id'], 'name' => $value->_value, 'parentID' => $value->_param['parentid'] == -1 ? 0:$value->_param['parentid'], 'minetype' => $value->_param['filetype']);
+                                        $aryFiles[] = array('fileurl' => $value->_param['fileurl'], 'id' => $value->_param['id'], 'name' => $value->_value, 'parentID' => $value->_param['parentid'] == -1 ? 0:$value->_param['parentid'], 'minetype' => $value->_param['filetype']);
                                 }
                         }else {
                                 $file = $this->xml->tree->filelist->file;
-                                $aryFiles[] = array('id' => $file->_param['id'], 'name' => $file->_value,'parentID' => $file->_param['parentid'] == -1 ? 0:$file->_param['parentid'], 'minetype' => $file->_param['filetype']);
+                                $aryFiles[] = array('fileurl' => $value->_param['fileurl'],'id' => $file->_param['id'], 'name' => $file->_value,'parentID' => $file->_param['parentid'] == -1 ? 0:$file->_param['parentid'], 'minetype' => $file->_param['filetype']);
                         }
                 }

pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php

@@ -412 +412 @@
             $data['user']=  array_merge($user,$local);        
             $this->lang->load('messages', 'message');
+            $admin=$this->session->userdata('adminInfo');
+            $roles=array();
+            foreach ($admin['roles'] as $role)
+            {
+                $roles[]=$role['role_name'];
+            }
+            $data['roles']=$roles;
             $data['provinces'] = lang('_PROVINCES_');
             $result['modal']=$this->load->view('frontend/user_infor', $data, TRUE);