From 767ab8e8b7addeec9249d64309e816f69cdeefee Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Fri, 7 Sep 2018 17:40:22 +0530 Subject: [PATCH] Fixed testcases run condition Fixed issue with running testcases Added file permission check in Probe.php for storage and bootstrap directories. Named route bugs fixed reported on bugsnag --- app/Console/Kernel.php | 2 +- .../Agent/helpdesk/OrganizationController.php | 2 +- public/probe.php | 75 +++++++++++++------ routes/web.php | 4 +- 4 files changed, 57 insertions(+), 26 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 4c5e8a0b8..fd3938f32 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -33,7 +33,7 @@ class Kernel extends ConsoleKernel */ protected function schedule(Schedule $schedule) { - if (env('DB_INSTALL') == 1) { + if (isInstall()) { $this->execute($schedule, 'fetching'); $this->execute($schedule, 'notification'); $this->execute($schedule, 'work'); diff --git a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php index 3e9c51b4f..5ab42060d 100644 --- a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php +++ b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php @@ -310,7 +310,7 @@ class OrganizationController extends Controller for ($i = $date1; $i <= $date2; $i = $i + 86400) { $thisDate = date('Y-m-d', $i); - $user_orga_relation_id = ''; + $user_orga_relation_id = []; $user_orga_relations = User_org::where('org_id', '=', $id)->get(); foreach ($user_orga_relations as $user_orga_relation) { $user_orga_relation_id[] = $user_orga_relation->user_id; diff --git a/public/probe.php b/public/probe.php index c8ffdbd42..ed34fa818 100644 --- a/public/probe.php +++ b/public/probe.php @@ -52,9 +52,58 @@ $extensions = [

FAVEO PROBE

+ + + + + + + + + + = 755) { ?> + + + + + + + + = 755) { ?> + + + + + +
Directory permissions
storage  (Directory should be writable by your web server or Faveo will not run. Give preferred permissions as 755 for directory and 644 for files.)
bootstrap/cache  (Directory should be writable by your web server or Faveo will not run. Give preferred permissions as 755 for directory and 644 for files.)
+
+ + + + + + '; + if (!extension_loaded($extension)) { + echo ''; + } else { + echo '"; + } + echo ''; + } + ?> +
PHP ExtensionsStatus
'.$extension." Not Enabled" + ."

To enable this, please open '".php_ini_loaded_file()."' and add 'extension = ".$extension."'

" + .'		'.$extension." Enabled
+
- + '; ?>
RequirementsServer Requirements Status
-
- - - - - - '; - if (!extension_loaded($extension)) { - echo ''; - } else { - echo '"; - } - echo ''; - } - ?> -
PHP ExtensionsStatus
'.$extension." Not Enabled" - ."

To enable this, please open '".php_ini_loaded_file()."' and add 'extension = ".$extension."'

" - .'		'.$extension." Enabled

NOTE: Please delete the file 'probe.php' once you have fixed all the issues.

+ +asdsnad,msan,mndda,mnd - \ No newline at end of file + diff --git a/routes/web.php b/routes/web.php index 4a406677f..b92b5987f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -311,7 +311,7 @@ Route::group(['middleware' => ['web']], function () { 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('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')->name('org-chart-data'); // Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); Route::post('org-chart-range/{id}/{date1}/{date2}', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); Route::get('profile', ['as' => 'profile', 'uses' => 'Agent\helpdesk\UserController@getProfile']); /* User profile get */ @@ -512,7 +512,7 @@ Route::group(['middleware' => ['web']], function () { Route::post('postedform', ['as'=>'client.form.post', 'uses'=>'Client\helpdesk\FormController@postedForm']); /* post the form to store the value */ //Route::get('check', 'CheckController@getcheck'); //testing checkbox auto-populate //Route::post('postcheck/{id}', 'CheckController@postcheck'); - Route::get('get-helptopic-form', 'Client\helpdesk\FormController@getCustomForm'); + Route::get('get-helptopic-form', 'Client\helpdesk\FormController@getCustomForm')->name('get-helptopic-form'); Route::get('home', ['as' => 'home', 'uses' => 'Client\helpdesk\WelcomepageController@index']); //guest layout