Rename browse controller to features/queries controller

openstreetmap · Jul 26, 2024 · b1ecf51 · b1ecf51
1 parent 5285f69
commit b1ecf51
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 38 deletions.
diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
@@ -4,7 +4,7 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
-    can :query, :browse
+    can :show, :feature_query
     can :show, [Node, Way, Relation]
     can [:index, :show], [OldNode, OldWay, OldRelation]
     can [:show, :new], Note

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
diff --git a/app/controllers/features/queries_controller.rb b/app/controllers/features/queries_controller.rb
@@ -0,0 +1,15 @@
+module Features
+  class QueriesController < ApplicationController
+    layout :map_layout
+
+    before_action :authorize_web
+    before_action :set_locale
+    before_action -> { check_database_readable(:need_api => true) }
+    before_action :require_oauth
+    before_action :update_totp
+    around_action :web_timeout
+    authorize_resource :class => :feature_query
+
+    def show; end
+  end
+end
diff --git a/app/views/browse/query.html.erb → app/views/features/queries/show.html.erb b/app/views/browse/query.html.erb → app/views/features/queries/show.html.erb
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -400,11 +400,13 @@ en:
       telephone_link: "Call %{phone_number}"
       colour_preview: "Colour %{colour_value} preview"
       email_link: "Email %{email}"
-    query:
-      title: "Query Features"
-      introduction: "Click on the map to find nearby features."
-      nearby: "Nearby features"
-      enclosing: "Enclosing features"
+  features:
+    queries:
+      show:
+        title: "Query Features"
+        introduction: "Click on the map to find nearby features."
+        nearby: "Nearby features"
+        enclosing: "Enclosing features"
   old_nodes:
     not_found:
       sorry: "Sorry, node #%{id} version %{version} could not be found."

diff --git a/config/routes.rb b/config/routes.rb
@@ -161,7 +161,9 @@
   get "/offline" => "site#offline"
   get "/key" => "site#key"
   get "/id" => "site#id"
-  get "/query" => "browse#query"
+  namespace :features, :path => "" do
+    resource :query, :only => :show
+  end
   get "/user/new" => "users#new"
   post "/user/new" => "users#create"
   get "/user/terms" => "users#terms"

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
diff --git a/test/controllers/features/queries_controller_test.rb b/test/controllers/features/queries_controller_test.rb
@@ -0,0 +1,20 @@
+require "test_helper"
+
+module Features
+  class QueriesControllerTest < ActionDispatch::IntegrationTest
+    ##
+    # test all routes which lead to this controller
+    def test_routes
+      assert_routing(
+        { :path => "/query", :method => :get },
+        { :controller => "features/queries", :action => "show" }
+      )
+    end
+
+    def test_show
+      get features_query_path
+      assert_response :success
+      assert_template "features/queries/show"
+    end
+  end
+end