From 4e28d945fd859ead80631e741f17d59332d62012 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Thu, 14 Mar 2019 16:40:39 +0000 Subject: [PATCH] 42_npmjs: disable addLinks git-svn-id: https://svn.fhem.de/fhem/trunk@18901 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/42_npmjs.pm | 53 ++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/fhem/FHEM/42_npmjs.pm b/fhem/FHEM/42_npmjs.pm index 007ac8d51..fcb4bc40b 100644 --- a/fhem/FHEM/42_npmjs.pm +++ b/fhem/FHEM/42_npmjs.pm @@ -39,7 +39,8 @@ use Data::Dumper; BEGIN { # Import from main:: GP_Import( - qw(readingsSingleUpdate + qw( + readingsSingleUpdate readingsBulkUpdate readingsBulkUpdateIfChanged readingsBeginUpdate @@ -60,7 +61,9 @@ BEGIN { init_done gettimeofday InternalTimer - RemoveInternalTimer) + RemoveInternalTimer + FW_webArgs + ) ); } @@ -1274,6 +1277,9 @@ sub CreateWarningList($) { my $warnings = $hash->{".fhem"}{npm}{'warnings'}; + # disable automatic links to FHEM devices + delete $FW_webArgs{addLinks}; + my $ret = '
'; $ret .= ''; $ret .= ''; @@ -1309,6 +1315,9 @@ sub CreateErrorList($) { my $hash = shift; my $error = $hash->{".fhem"}{npm}{errors}; + # disable automatic links to FHEM devices + delete $FW_webArgs{addLinks}; + my $ret = '
'; $ret .= ''; @@ -1344,6 +1353,9 @@ sub CreateInstalledList($$) { my $html = defined( $hash->{CL} ) && $hash->{CL}{TYPE} eq "FHEMWEB" ? 1 : 0; $packages = $hash->{".fhem"}{npm}{listedpackages}{dependencies}; + # disable automatic links to FHEM devices + delete $FW_webArgs{addLinks}; + my $header = ''; my $footer = ''; if ($html) { @@ -1417,6 +1429,9 @@ sub CreateOutdatedList($$) { $packages = $hash->{".fhem"}{npm}{outdatedpackages}; my $npmglobal = ( AttrVal( $hash->{NAME}, 'npmglobal', 1 ) eq '1' ? 1 : 0 ); + # disable automatic links to FHEM devices + delete $FW_webArgs{addLinks}; + my $header = ''; my $footer = ''; if ($html) { @@ -1744,14 +1759,6 @@ sub ToDay() { "abstract": "Modul zur Bedienung der Node.js Installation und Updates" } }, - "keywords": [ - "fhem-core", - "fhem-mod", - "fhem-mod-device", - "nodejs", - "node", - "npm" - ], "version": "v1.0.5", "release_status": "stable", "author": [ @@ -1818,32 +1825,6 @@ sub ToDay() { "ALL=(ALL) NOPASSWD:SETENV: /usr/local/bin/npm uninstall *": 0 } } - }, - "x_prereqs_permissions_fileown": { - "runtime": { - "requires": { - }, - "recommends": { - }, - "suggests": { - } - } - }, - "x_prereqs_permissions_filemod": { - "runtime": { - "requires": { - }, - "recommends": { - }, - "suggests": { - } - } - }, - "resources": { - "bugtracker": { - "web": "https://forum.fhem.de/index.php/board,29.0.html", - "x_web_title": "FHEM Forum: Sonstige Systeme" - } } } =end :application/json;q=META.json