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 - jellyfrog fixes - part2

Browse Source
This commit is contained in:
Anthony F McInerney
2020-10-17 15:27:14 +01:00
parent 2a7099816c
commit 37e2a227e2
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/ServiceTemplate.php
-7
View File
@@ -31,13 +31,6 @@ class ServiceTemplate extends Model implements Keyable
return $this->id . '-' . $this->device_group_id;
}
public static function getServiceTemplate($query)
{
return $query->where([
['id', '=', $query],
]);
}
public function scopeHasAccess($query, User $user)
{
if ($user->hasGlobalRead()) {
includes/services.inc.php
+1 -1
View File
@@ -130,7 +130,7 @@ function discover_service_template($service_template = null)
{
$services_template = ServiceTemplate::find($id);
$status = null;
foreach (DB::table('device_group_device')->where('device_group_id', $services_template[0]['device_group_id'])->pluck('device_id') as $device) {
foreach (Device::inDeviceGroup($services_template[0]['device_group_id'])->pluck('device_id') as $device) {
foreach (Service::where('service_template_id', $service_template)->where('device_id', $device)->where('service_template_changed', '!=', $services_template[0]['changed'])->pluck('service_id') as $service) {
$update = ['service_desc' => $services_template[0]['desc'], 'service_ip' => $services_template[0]['ip'], 'service_param' => $services_template[0]['param'], 'service_ignore' => $services_template[0]['ignore'], 'service_disabled' => $services_template[0]['disabled'], 'service_template_id' => $services_template[0]['id'], 'service_name' => $services_template[0]['name'], 'service_template_changed' => $services_template[0]['changed']];
edit_service($update, $service['service_id']);