Merge pull request #9530 from opf/fix/34591/link-to-notification-settings
[34591] Dynamic text matcher to output base URL for formattablespull/9591/head
commit
5cef260185
@ -0,0 +1,77 @@ |
||||
#-- encoding: UTF-8 |
||||
|
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2021 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See docs/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
module OpenProject::TextFormatting |
||||
module Filters |
||||
class SettingMacrosFilter < HTML::Pipeline::Filter |
||||
ALLOWED_SETTINGS = %w[ |
||||
host_name |
||||
base_url |
||||
].freeze |
||||
|
||||
def self.regexp |
||||
%r{ |
||||
\{\{opSetting:(.+?)\}\} |
||||
}x |
||||
end |
||||
|
||||
def call |
||||
return html unless applicable? |
||||
|
||||
html.gsub(self.class.regexp) do |matched_string| |
||||
variable = $1.to_s |
||||
variable.gsub!('\\', '') |
||||
|
||||
if ALLOWED_SETTINGS.include?(variable) |
||||
send variable |
||||
else |
||||
matched_string |
||||
end |
||||
end |
||||
end |
||||
|
||||
private |
||||
|
||||
def host_name |
||||
OpenProject::StaticRouting::UrlHelpers.host |
||||
end |
||||
|
||||
def base_url |
||||
OpenProject::Application.root_url |
||||
end |
||||
|
||||
## |
||||
# Faster inclusion check before the regex is being applied |
||||
def applicable? |
||||
html.include?('{{opSetting:') |
||||
end |
||||
end |
||||
end |
||||
end |
@ -0,0 +1,53 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2021 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See docs/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
require 'spec_helper' |
||||
|
||||
describe 'Homescreen index', type: :feature do |
||||
let!(:user) { FactoryBot.build_stubbed(:user) } |
||||
let!(:project) { FactoryBot.create(:public_project, identifier: 'public-project') } |
||||
|
||||
before do |
||||
login_as user |
||||
visit root_url |
||||
end |
||||
|
||||
describe 'with a dynamic URL in the welcome text', |
||||
with_settings: { |
||||
welcome_text: "With [a link to the public project]({{opSetting:base_url}}/projects/public-project)", |
||||
welcome_on_homescreen?: true |
||||
} do |
||||
it 'renders the correct link' do |
||||
expect(page) |
||||
.to have_selector("a[href=\"#{OpenProject::Application.root_url}/projects/public-project\"]") |
||||
|
||||
click_link "a link to the public project" |
||||
expect(page).to have_current_path project_path(project) |
||||
end |
||||
end |
||||
end |
@ -0,0 +1,74 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2021 the OpenProject GmbH |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See docs/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
require 'spec_helper' |
||||
require_relative './expected_markdown' |
||||
|
||||
describe OpenProject::TextFormatting, |
||||
'Setting variable' do |
||||
include_context 'expected markdown modules' |
||||
|
||||
describe 'attribute label macros' do |
||||
it_behaves_like 'format_text produces' do |
||||
let(:raw) do |
||||
<<~RAW |
||||
Inline reference to variable setting: {{opSetting:host_name}} |
||||
|
||||
Inline reference to base_url variable: {{opSetting:base_url}} |
||||
|
||||
[Link with setting]({{opSetting:base_url}}/foo/bar) |
||||
|
||||
Inline reference to invalid variable: {{opSetting:smtp_password}} |
||||
|
||||
Inline reference to missing variable: {{opSetting:does_not_exist}} |
||||
RAW |
||||
end |
||||
|
||||
let(:expected) do |
||||
<<~EXPECTED |
||||
<p class="op-uc-p"> |
||||
Inline reference to variable setting: #{OpenProject::StaticRouting::UrlHelpers.host} |
||||
</p> |
||||
<p class="op-uc-p"> |
||||
Inline reference to base_url variable: #{OpenProject::Application.root_url} |
||||
</p> |
||||
<p class="op-uc-p"> |
||||
<a href="#{OpenProject::Application.root_url}/foo/bar" rel="noopener noreferrer" |
||||
class="op-uc-link">Link with setting</a> |
||||
</p> |
||||
<p class="op-uc-p"> |
||||
Inline reference to invalid variable: {{opSetting:smtp_password}} |
||||
</p> |
||||
<p class="op-uc-p"> |
||||
Inline reference to missing variable: {{opSetting:does_not_exist}} |
||||
</p> |
||||
EXPECTED |
||||
end |
||||
end |
||||
end |
||||
end |
Loading…
Reference in new issue