From fee3484155a00c8699a96aaad381ca6b753968d9 Mon Sep 17 00:00:00 2001
From: Julien Rouhaud <julien.rouhaud@free.fr>
Date: Mon, 22 Aug 2016 12:31:40 +0200
Subject: [PATCH] Add get_tag helper.

And fix handling of multiple tags selection
---
 ui/lib/Helpers/Utils.pm | 15 +++++++++++++++
 ui/lib/OPM/Accounts.pm  |  2 +-
 ui/lib/OPM/Graphs.pm    |  4 ++--
 ui/lib/OPM/Server.pm    | 18 +++---------------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ui/lib/Helpers/Utils.pm b/ui/lib/Helpers/Utils.pm
index fbb2f16..da03a58 100644
--- a/ui/lib/Helpers/Utils.pm
+++ b/ui/lib/Helpers/Utils.pm
@@ -144,6 +144,21 @@ sub register {
             $sth->finish;
             return $account_tags;
         } );
+
+    $app->helper(
+        get_tags => sub {
+            my $ctrl         = shift;
+            my @tags;
+
+
+            if ($Mojolicious::VERSION < 5.48) {
+                @tags = $ctrl->param('tags');
+            } else {
+                @tags = $ctrl->every_param('tags');
+            }
+
+            return @tags;
+        } );
 }
 
 1;
diff --git a/ui/lib/OPM/Accounts.pm b/ui/lib/OPM/Accounts.pm
index afd06ca..6336cfc 100644
--- a/ui/lib/OPM/Accounts.pm
+++ b/ui/lib/OPM/Accounts.pm
@@ -44,7 +44,7 @@ sub adm {
 sub list {
     my $self    = shift;
     my $accname = $self->param('accname');
-    my @tags = $self->param('tags') || ();
+    my @tags = $self->get_tags();;
     my $servers;
     my @params;
     my $sth;
diff --git a/ui/lib/OPM/Graphs.pm b/ui/lib/OPM/Graphs.pm
index 063e4b1..3d67ed2 100644
--- a/ui/lib/OPM/Graphs.pm
+++ b/ui/lib/OPM/Graphs.pm
@@ -63,7 +63,7 @@ sub showservice {
     my $hostname     = $self->param('server');
     my $service_name = $self->param('service');
     my $interval     = $self->param('interval');
-    my @tags         = $self->param('tags') || ();
+    my @tags = $self->get_tags();
     my $server_id;
     my $services;
     my $graphs;
@@ -136,7 +136,7 @@ sub showserver {
     my $server_id = $self->param('idserver');
     my $period    = $self->param('period');
     my $interval  = $self->param('interval');
-    my @tags      = $self->param('tags') || ();
+    my @tags = $self->get_tags();
     my $servers;
     my $graphs;
     my $hostname;
diff --git a/ui/lib/OPM/Server.pm b/ui/lib/OPM/Server.pm
index e0d7a4c..e0b1197 100644
--- a/ui/lib/OPM/Server.pm
+++ b/ui/lib/OPM/Server.pm
@@ -71,7 +71,7 @@ sub edit {
 sub list {
     my $self = shift;
     my $servers;
-    my @tags = $self->param('tags') || ();
+    my @tags = $self->get_tags();
     my @params;
     my $sth;
     my $sql  = q{
@@ -193,16 +193,10 @@ sub host {
 sub server_edit_tags {
     my $self = shift;
     my $id   = $self->param('idserver');
-    my @tags;
+    my @tags = $self->get_tags();
     my $rc ;
     my $sql;
 
-    if ( $Mojolicious::VERSION < 5.48 ) {
-        @tags = $self->param('tags');
-    } else {
-        @tags = $self->every_param('tags');
-    }
-
     $sql = $self->prepare(
         q{
         SELECT public.update_server_tags(?, ?);
@@ -224,16 +218,10 @@ sub server_edit_tags {
 sub service_edit_tags {
     my $self = shift;
     my $id   = $self->param('idservice');
-    my @tags;
+    my @tags = $self->get_tags();;
     my $rc ;
     my $sql;
 
-    if ( $Mojolicious::VERSION < 5.48 ) {
-        @tags = $self->param('tags');
-    } else {
-        @tags = $self->every_param('tags');
-    }
-
     $sql = $self->prepare(
         q{
         SELECT public.update_service_tags(?, ?);