Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Don't add the slug of the space in some links#12590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
andreslucena merged 13 commits intodevelopfromchore/admin-links
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from5 commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
# frozen_string_literal: true

require "spec_helper"

module Decidim
describe ResourceLocatorPresenter, type: :helper do
let(:organization) { create(:organization, host: "1.lvh.me") }

let(:route_fragment) { "assemblies/#{participatory_space.slug}" }
let(:admin_route_fragment) { "assemblies/#{participatory_space.slug}" }

let(:participatory_space) do
create(:assembly, organization:)
end

let(:component) do
create(:component, id: 1, participatory_space:)
end

let(:resource) do
create(:dummy_resource, id: 1, component:)
end

context "with a component resource" do
describe "#url" do
subject { described_class.new(resource).url }

it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}/f/1/dummy_resources/1") }

context "when specific port configured" do
before do
allow(ActionMailer::Base)
.to receive(:default_url_options)
.and_return(port: 3000)
end

it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}/f/1/dummy_resources/1") }
end
end

describe "#path" do
subject { described_class.new(resource).path }

it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1") }
end

describe "#show" do
subject { described_class.new(participatory_space).show }

it { is_expected.to start_with("/admin/#{admin_route_fragment}") }
end

describe "#edit" do
subject { described_class.new(participatory_space).edit }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/edit") }
end
end

context "with a polymorphic resource" do
let(:nested_resource) do
create(:nested_dummy_resource, id: 1, dummy_resource: resource)
end

describe "#url" do
subject { described_class.new([resource, nested_resource]).url }

it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }

context "when specific port configured" do
before do
allow(ActionMailer::Base)
.to receive(:default_url_options)
.and_return(port: 3000)
end

it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }
end
end

describe "#path" do
subject { described_class.new([resource, nested_resource]).path }

it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }
end

describe "#index" do
subject { described_class.new([resource, nested_resource]).index }

it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources") }
end

describe "#admin_index" do
subject { described_class.new([resource, nested_resource]).admin_index }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources") }
end

describe "#show" do
subject { described_class.new([resource, nested_resource]).show }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources/1") }
end

describe "#edit" do
subject { described_class.new([resource, nested_resource]).edit }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources/1/edit") }
end
end

context "with a participatory_space" do
describe "#url" do
subject { described_class.new(participatory_space).url }

it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}") }

context "when specific port configured" do
before do
allow(ActionMailer::Base)
.to receive(:default_url_options)
.and_return(port: 3000)
end

it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}") }
end
end

describe "#path" do
subject { described_class.new(participatory_space).path }

it { is_expected.to eq("/#{route_fragment}") }
end

describe "#show" do
subject { described_class.new(participatory_space).show }

it { is_expected.to eq("/admin/#{admin_route_fragment}") }
end

describe "#edit" do
subject { described_class.new(participatory_space).edit }

it { is_expected.to eq("/admin/#{admin_route_fragment}/edit") }
end
end
end
end
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
# frozen_string_literal: true

require "spec_helper"

module Decidim
describe ResourceLocatorPresenter, type: :helper do
let(:organization) { create(:organization, host: "1.lvh.me") }

let(:route_fragment) { "conferences/#{participatory_space.slug}" }
let(:admin_route_fragment) { "conferences/#{participatory_space.slug}" }

let(:participatory_space) do
create(:conference, organization:)
end

let(:component) do
create(:component, id: 1, participatory_space:)
end

let(:resource) do
create(:dummy_resource, id: 1, component:)
end

context "with a component resource" do
describe "#url" do
subject { described_class.new(resource).url }

it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}/f/1/dummy_resources/1") }

context "when specific port configured" do
before do
allow(ActionMailer::Base)
.to receive(:default_url_options)
.and_return(port: 3000)
end

it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}/f/1/dummy_resources/1") }
end
end

describe "#path" do
subject { described_class.new(resource).path }

it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1") }
end

describe "#show" do
subject { described_class.new(participatory_space).show }

it { is_expected.to start_with("/admin/#{admin_route_fragment}") }
end

describe "#edit" do
subject { described_class.new(participatory_space).edit }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/edit") }
end
end

context "with a polymorphic resource" do
let(:nested_resource) do
create(:nested_dummy_resource, id: 1, dummy_resource: resource)
end

describe "#url" do
subject { described_class.new([resource, nested_resource]).url }

it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }

context "when specific port configured" do
before do
allow(ActionMailer::Base)
.to receive(:default_url_options)
.and_return(port: 3000)
end

it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }
end
end

describe "#path" do
subject { described_class.new([resource, nested_resource]).path }

it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }
end

describe "#index" do
subject { described_class.new([resource, nested_resource]).index }

it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources") }
end

describe "#admin_index" do
subject { described_class.new([resource, nested_resource]).admin_index }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources") }
end

describe "#show" do
subject { described_class.new([resource, nested_resource]).show }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources/1") }
end

describe "#edit" do
subject { described_class.new([resource, nested_resource]).edit }

it { is_expected.to start_with("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources/1/edit") }
end
end

context "with a participatory_space" do
describe "#url" do
subject { described_class.new(participatory_space).url }

it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}") }

context "when specific port configured" do
before do
allow(ActionMailer::Base)
.to receive(:default_url_options)
.and_return(port: 3000)
end

it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}") }
end
end

describe "#path" do
subject { described_class.new(participatory_space).path }

it { is_expected.to eq("/#{route_fragment}") }
end

describe "#show" do
subject { described_class.new(participatory_space).show }

it { is_expected.to eq("/admin/#{admin_route_fragment}") }
end

describe "#edit" do
subject { described_class.new(participatory_space).edit }

it { is_expected.to eq("/admin/#{admin_route_fragment}/edit") }
end
end
end
end
37 changes: 29 additions & 8 deletionsdecidim-core/lib/decidim/engine_router.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ class EngineRouter
#
# @return [EngineRouter] The new engine router
def self.main_proxy(target)
new(target.mounted_engine, target.mounted_params)
new(target.mounted_engine, target)
end

# Instantiates a router to the backend engine for an object.
Expand All@@ -25,17 +25,15 @@ def self.main_proxy(target)
#
# @return [EngineRouter] The new engine router
def self.admin_proxy(target)
new(target.mounted_admin_engine, target.mounted_params)
new(target.mounted_admin_engine, target)
end

def initialize(engine,default_url_options)
def initialize(engine,target)
@engine = engine
@default_url_options =default_url_options
@target =target
end

def default_url_options
@default_url_options.reverse_merge(configured_default_url_options)
end
attr_reader :default_url_options

def respond_to_missing?(method_name, include_private = false)
route_helper?(method_name) || super
Expand All@@ -44,11 +42,34 @@ def respond_to_missing?(method_name, include_private = false)
def method_missing(method_name, *)
return super unless route_helper?(method_name)

send(@engine).send(method_name, *)
filter_slug_params!(method_name)

path = send(engine).send(method_name, *)

raise "Wrong url generated" if [
path.include?("initiative_slug"),
path.include?("assembly_slug"),
path.include?("conference_slug"),
path.include?("participatory_process_slug")
].any?

path
end

private

attr_reader :engine, :target

def filter_slug_params!(method_name)
@default_url_options = configured_default_url_options

return unless target.respond_to?(:mounted_params)

@default_url_options = target.mounted_params.reverse_merge(configured_default_url_options)
skip_space_slug = target.respond_to?(:slug_param_name) && target.respond_to?(:skip_space_slug?) && target.skip_space_slug?(method_name)
@default_url_options.except!(target.slug_param_name) if skip_space_slug == true
end

def route_helper?(method_name)
method_name.to_s.match?(/_(url|path)$/)
end
Expand Down
15 changes: 15 additions & 0 deletionsdecidim-core/lib/decidim/participable.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,21 @@ module Participable
:mounted_engine, :mounted_admin_engine, :admin_extension_module, :admins_query,
to: :class

def skip_space_slug?(method_name)
[
"edit_#{underscored_name}_path".to_sym,
"edit_#{underscored_name}_url".to_sym,
"#{underscored_name}_path".to_sym,
"#{underscored_name}_url".to_sym,
"new_#{underscored_name}_path".to_sym,
"new_#{underscored_name}_url".to_sym
].include?(method_name)
end

def slug_param_name
"#{underscored_name}_slug".to_sym
end

def mounted_params
{
:host => organization.host,
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp