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

Merge pull request #267 from ladybirdweb/analysis-zE5yND

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
Manish Verma
2016-10-25 14:59:02 +05:30
committed by GitHub
parent d5d71893e9 a994e34385
commit e5ca046a80
4 changed files with 30 additions and 32 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.
* *

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

@@ -748,7 +748,7 @@ class UserController extends Controller
public function UserAssignOrg($id) public function UserAssignOrg($id)
{ {
$org_name = Input::get('org'); $org_name = Input::get('org');
$org= Organization::where('name','=',$org_name)->lists('id')->first(); $org = Organization::where('name', '=', $org_name)->lists('id')->first();
$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;

2
app/Http/routes.php
View File

@@ -505,7 +505,7 @@ Route::group(['middleware' => ['web']], function () {
$breadcrumbs->push(Lang::get('lang.view_organization_profile'), url('organizations/{organizations}')); $breadcrumbs->push(Lang::get('lang.view_organization_profile'), url('organizations/{organizations}'));
}); });
Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']); Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']);
Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']);//auto fill organization name// Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']); //auto fill organization name//
Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']); Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']);
Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData'); Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData');
// Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); // Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);

8
resources/lang/en/lang.php
View File

@@ -1507,10 +1507,10 @@ return [
* User Module * User Module
* -------------------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
*/ */
'agent_report' =>'Agent Report', 'agent_report' => 'Agent Report',
'assign_tickets' =>'Assign Tickets', 'assign_tickets' => 'Assign Tickets',
'delete_agent' =>'Delete Agent', 'delete_agent' => 'Delete Agent',
'delete_user' =>'Delete User', 'delete_user' => 'Delete User',
'confirm_deletion' => 'Confirm Deletion', 'confirm_deletion' => 'Confirm Deletion',
'delete_all_content' => ' Delete all content', 'delete_all_content' => ' Delete all content',
'agent_profile' => 'Agent Profile', 'agent_profile' => 'Agent Profile',