mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

service templates - move to blade -wip

Browse Source
This commit is contained in:
Anthony F McInerney
2020-10-17 10:01:29 +01:00
parent c2cf59f538
commit 0d77d0ca6f
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ServiceTemplateController.php
+3 -3
View File
@@ -91,7 +91,7 @@ class ServiceTemplateController extends Controller
*/
public function show(ServiceTemplate $serviceTemplate)
{
return redirect(url('/services/templates/=' . $serviceTemplate->id));
return redirect(url('/services/template=' . $serviceTemplate->id));
}
/**
@@ -137,9 +137,9 @@ class ServiceTemplateController extends Controller
$serviceTemplate->fill($request->only(['name', 'device_group_id', 'type', 'param', 'ip', 'desc', 'changed', 'ignore', 'disable']));
if ($serviceTemplate->isDirty() || $devices_updated) {
if ($serviceTemplate->isDirty()) {
try {
if ($serviceTemplate->save() || $devices_updated) {
if ($serviceTemplate->save()) {
Toastr::success(__('Service Template :name updated', ['name' => $serviceTemplate->name]));
} else {
Toastr::error(__('Failed to save'));
app/Models/ServiceTemplate.php
+9
View File
@@ -44,6 +44,15 @@ class ServiceTemplate extends Model implements Keyable
]);
}
public function scopeHasAccess($query, User $user)
{
if ($user->hasGlobalRead()) {
return $query;
}
return $query->whereIn('id', Permissions::serviceTemplatesForUser($user));
}
/**
* @param Builder $query
* @return Builder
includes/services.inc.php
+1
View File
@@ -129,6 +129,7 @@ function delete_service_template($service_template = null)
function discover_service_template($service_template = null)
{
$services_template = ServiceTemplate::getServiceTemplate($service_template);
$serviceTemplate->fill($request->only(['name', 'device_group_id', 'type', 'param', 'ip', 'desc', 'changed', 'ignore', 'disable']));
$status = null;
foreach (DB::table('device_group_device')->where('device_group_id', $services_template[0]['device_group_id'])->pluck('device_id') as $device) {
foreach (DB::table('services')->where('service_template_id', $service_template)->where('device_id', $device)->where('service_template_changed', '!=', $services_template[0]['changed'])->pluck('service_id') as $service) {