From 0898458132400dce4d9033487b1bde120762327e Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Thu, 19 Jun 2014 08:51:04 +1000
Subject: Bug 1023725 - Rename Bug.flag_types webservice call to FlagType.get
 r=glob, a=glob

---
 Bugzilla/WebService/Server/REST.pm                    |  1 +
 Bugzilla/WebService/Server/REST/Resources/Bug.pm      | 17 -----------------
 Bugzilla/WebService/Server/REST/Resources/FlagType.pm | 19 +++++++++++++++++--
 3 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'Bugzilla/WebService/Server')

diff --git a/Bugzilla/WebService/Server/REST.pm b/Bugzilla/WebService/Server/REST.pm
index ce127f797..bdc8365fc 100644
--- a/Bugzilla/WebService/Server/REST.pm
+++ b/Bugzilla/WebService/Server/REST.pm
@@ -23,6 +23,7 @@ use Bugzilla::WebService::Util qw(taint_data fix_credentials);
 use Bugzilla::WebService::Server::REST::Resources::Bug;
 use Bugzilla::WebService::Server::REST::Resources::Bugzilla;
 use Bugzilla::WebService::Server::REST::Resources::Classification;
+use Bugzilla::WebService::Server::REST::Resources::FlagType;
 use Bugzilla::WebService::Server::REST::Resources::Group;
 use Bugzilla::WebService::Server::REST::Resources::Product;
 use Bugzilla::WebService::Server::REST::Resources::User;
diff --git a/Bugzilla/WebService/Server/REST/Resources/Bug.pm b/Bugzilla/WebService/Server/REST/Resources/Bug.pm
index d0f470fcd..7ab111d86 100644
--- a/Bugzilla/WebService/Server/REST/Resources/Bug.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/Bug.pm
@@ -151,23 +151,6 @@ sub _rest_resources {
                 }
             }
         },
-        qr{^/flag_types/([^/]+)/([^/]+)$}, {
-            GET => {
-                method => 'flag_types',
-                params => sub {
-                    return { product   => $_[0],
-                             component => $_[1] };
-                }
-            }
-        },
-        qr{^/flag_types/([^/]+)$}, {
-            GET => {
-                method => 'flag_types',
-                params => sub {
-                    return { product => $_[0] };
-                }
-            }
-        }
     ];
     return $rest_resources;
 }
diff --git a/Bugzilla/WebService/Server/REST/Resources/FlagType.pm b/Bugzilla/WebService/Server/REST/Resources/FlagType.pm
index 745785838..1de5b1264 100644
--- a/Bugzilla/WebService/Server/REST/Resources/FlagType.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/FlagType.pm
@@ -21,13 +21,28 @@ BEGIN {
 
 sub _rest_resources {
     my $rest_resources = [
-        qr{^/flagtype$}, {
+        qr{^/flag_type$}, {
             POST => {
                 method => 'create',
                 success_code => STATUS_CREATED
             }
         },
-        qr{^/flagtype/([^/]+)$}, {
+        qr{^/flag_type/([^/]+)/([^/]+)$}, {
+            GET => {
+                method => 'get',
+                params => sub {
+                    return { product   => $_[0],
+                             component => $_[1] };
+                }
+            }
+        },
+        qr{^/flag_type/([^/]+)$}, {
+            GET => {
+                method => 'get',
+                params => sub {
+                    return { product => $_[0] };
+                }
+            },
             PUT => {
                 method => 'update',
                 params => sub {
-- 
cgit v1.2.3-24-g4f1b