cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #269 from ladybirdweb/analysis-8wWbO4

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
Manish Verma
2016-10-26 13:18:57 +05:30
committed by GitHub
parent 7aec2427ea c2940bcc04
commit f7030a1ecd
4 changed files with 56 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View File

@@ -66,13 +66,11 @@ class OrganizationController extends Controller
* *
* @return datatable * @return datatable
*/ */
public function organizationAutofill() public function organizationAutofill()
{ {
return view('themes.default1.agent.helpdesk.organization.getautocomplete'); return view('themes.default1.agent.helpdesk.organization.getautocomplete');
} }
/** /**
* This function is used to display the list of Organizations. * This function is used to display the list of Organizations.
* *

25
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -750,31 +750,22 @@ class UserController extends Controller
$org_name = Input::get('org'); $org_name = Input::get('org');
if ($org_name) { if ($org_name) {
$org = Organization::where('name', '=', $org_name)->lists('id')->first(); $org = Organization::where('name', '=', $org_name)->lists('id')->first();
if ($org) { if ($org) {
$user_org = new User_org(); $user_org = new User_org();
$user_org->org_id = $org; $user_org->org_id = $org;
$user_org->user_id = $id; $user_org->user_id = $id;
$user_org->save(); $user_org->save();
return 1; return 1;
} } else {
else{
return 0; return 0;
} }
} else {
}
else{
return 2; return 2;
} }
} }
/** /**
* Assigning an user to an organization. * Assigning an user to an organization.
* *
@@ -787,27 +778,19 @@ class UserController extends Controller
$org_name = Input::get('org'); $org_name = Input::get('org');
if ($org_name) { if ($org_name) {
$org = Organization::where('name', '=', $org_name)->lists('id')->first(); $org = Organization::where('name', '=', $org_name)->lists('id')->first();
if ($org) { if ($org) {
$user_org = User_org::where('user_id', '=', $id)->first(); $user_org = User_org::where('user_id', '=', $id)->first();
$user_org->org_id = $org; $user_org->org_id = $org;
$user_org->user_id = $id; $user_org->user_id = $id;
$user_org->save(); $user_org->save();
return 1; return 1;
} } else {
else{
return 0; return 0;
} }
} else {
}
else{
return 2; return 2;
} }
} }