135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes to SQL and api spec

Browse Source
This commit is contained in:
Oliver Gorwits
2018-12-31 23:21:44 +00:00
parent 0151fc86a7
commit f56c48b83d
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/DB/Result/Virtual/UserRole.pm
View File

@@ -20,8 +20,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
SELECT username, 'ldap' AS role FROM users SELECT username, 'ldap' AS role FROM users
WHERE ldap WHERE ldap
UNION UNION
SELECT username, 'api', AS role FROM users SELECT username, 'api' AS role FROM users
WHERE token AND token_from WHERE token IS NOT NULL AND token_from IS NOT NULL
ENDSQL ENDSQL
); );

4
lib/App/Netdisco/Util/API.pm
View File

@@ -12,11 +12,11 @@ our @EXPORT = qw/
sub parse_search_params { sub parse_search_params {
my $params = shift; my $params = shift;
my $search = {}; my $search = {};
my $partial = $params->{partial} || 0; my $partial = $params->{partial} || false;
foreach my $param (keys %{$params}) { foreach my $param (keys %{$params}) {
if ($param ne 'return_url' and $param ne 'partial') { if ($param ne 'return_url' and $param ne 'partial') {
if ($partial == 1) { if ($partial eq 'true') {
$search->{"text(".$param.")"} = { -ilike => '%'.$params->{$param}.'%'}; $search->{"text(".$param.")"} = { -ilike => '%'.$params->{$param}.'%'};
} }
else { else {

3
lib/App/Netdisco/Web/Plugin/API/NodeIP.pm
View File

@@ -25,6 +25,9 @@ swagger_path {
description => 'All parameters will be searched for case insensitively in their values', description => 'All parameters will be searched for case insensitively in their values',
}, },
], ],
responses => {
default => { description => 'A row from the node_ip table' },
},
}, },
get '/api/nodeip/search' => require_role api => sub { get '/api/nodeip/search' => require_role api => sub {
my $para = params; my $para = params;