diff --git a/civihr_employee_portal/civihr_employee_portal.module b/civihr_employee_portal/civihr_employee_portal.module index e7c3ace3..b8a51fee 100755 --- a/civihr_employee_portal/civihr_employee_portal.module +++ b/civihr_employee_portal/civihr_employee_portal.module @@ -5189,7 +5189,7 @@ function civihr_employee_portal_hrreport_landing_page() { $jsOptions = ['type' => 'file', 'scope' => 'footer']; if (_civihr_employee_portal_is_extension_enabled('org.civicrm.reqangular')) { - drupal_add_js(CRM_Core_Resources::singleton()->getUrl('org.civicrm.reqangular') . "dist/reqangular.min.js", $jsOptions); + drupal_add_js(CRM_Core_Resources::singleton()->getUrl('org.civicrm.reqangular') . "js/dist/reqangular.min.js", $jsOptions); } drupal_add_css(drupal_get_path('module', 'civihr_employee_portal') . '/css/reports.css'); @@ -5554,7 +5554,7 @@ function _civihr_employee_portal_add_report_scripts() { drupal_add_js(drupal_get_path('module', 'civihr_employee_portal') . '/lib/moment/moment.min.js', $jsOptions); if (_civihr_employee_portal_is_extension_enabled('org.civicrm.reqangular')) { - drupal_add_js(CRM_Core_Resources::singleton()->getUrl('org.civicrm.reqangular') . "dist/reqangular.min.js", $jsOptions); + drupal_add_js(CRM_Core_Resources::singleton()->getUrl('org.civicrm.reqangular') . "js/dist/reqangular.min.js", $jsOptions); } // Base reports.js script diff --git a/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc b/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc index 7cc84123..126302cb 100644 --- a/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc +++ b/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc @@ -2301,9 +2301,9 @@ function civihr_default_permissions_user_default_permissions() { 'module' => 'civihr_employee_portal', ); - // Exported permission: 'view system status on footer'. - $permissions['view system status on footer'] = array( - 'name' => 'view system status on footer', + // Exported permission: 'view system notifications'. + $permissions['view system notifications'] = array( + 'name' => 'view system notifications', 'roles' => array( 'administrator' => 'administrator', ), diff --git a/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.info b/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.info index 3fbb5279..6ba66681 100644 --- a/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.info +++ b/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.info @@ -269,7 +269,7 @@ features[user_permission][] = view pane admin links features[user_permission][] = view report sql features[user_permission][] = view revisions features[user_permission][] = view staff directory -features[user_permission][] = view system status on footer +features[user_permission][] = view system notifications features[user_permission][] = view the administration theme features[user_permission][] = view vacancies features[user_role][] = HR Admin