From e39da24bc9ca3ba590695cafdacf7fe1ab925b7a Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@sipwise.com>
Date: Thu, 13 Nov 2014 10:15:26 +0200
Subject: [PATCH] MT#9177 Small fixes for yealink

---
 lib/NGCP/Panel/Form/Device/Model.pm         | 1 +
 lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm | 3 +--
 share/templates/device/list.tt              | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/NGCP/Panel/Form/Device/Model.pm b/lib/NGCP/Panel/Form/Device/Model.pm
index bd4d7dd58c..230e78f3b7 100644
--- a/lib/NGCP/Panel/Form/Device/Model.pm
+++ b/lib/NGCP/Panel/Form/Device/Model.pm
@@ -204,6 +204,7 @@ has_field 'bootstrap_method' => (
     options => [
         { label => 'Cisco', value => 'http' },
         { label => 'Panasonic', value => 'redirect_panasonic' },
+        { label => 'Yealink', value => 'redirect_yealink' },
     ],
     default => 'http',
     element_attr => {
diff --git a/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm b/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm
index 7eb2a38569..05c4040dc1 100644
--- a/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm
+++ b/lib/NGCP/Panel/Utils/DeviceBootstrap/RPC.pm
@@ -63,7 +63,6 @@ sub rpc_https_call{
 
 sub init_content_params{
     my($self) = @_;
-    $self->params->{redirect_uri_params} ||= '{MAC}';
     $self->{content_params} ||= {};
     $self->content_params->{uri} = $self->get_bootstrap_uri();
 
@@ -93,7 +92,7 @@ sub get_bootstrap_uri{
     my $uri = $self->params->{redirect_uri};
     my $uri_params = $self->params->{redirect_uri_params} || '';
     if($uri){
-        if(!$uri =~/^https?:\/\//i ){
+        if($uri !~/^https?:\/\//i ){
             $uri = 'http://'.$uri;
         }
     }else{
diff --git a/share/templates/device/list.tt b/share/templates/device/list.tt
index d1c54692c5..b82a74c916 100644
--- a/share/templates/device/list.tt
+++ b/share/templates/device/list.tt
@@ -34,10 +34,6 @@ function vendor2bootstrapMethod(vendorField){
                 bootstrapMethod = 'redirect_panasonic';
                 break;
             ;
-            case "linksys":
-                bootstrapMethod = 'redirect_linksys';
-                break;
-            ;
             case "yealink":
                 bootstrapMethod = 'redirect_yealink';
                 break;