A platform for community discussion. Free, open, simple.
UX: Organization website field (#40418)
Derek Rushforth64d8e89a5ebb
diff --git a/app/controllers/admin/config/about_controller.rb b/app/controllers/admin/config/about_controller.rbindex e81fcf49618..328f031a81b 100644--- a/app/controllers/admin/config/about_controller.rb+++ b/app/controllers/admin/config/about_controller.rb@@ -50,6 +50,7 @@ class Admin::Config::AboutController < Admin::AdminControllerif your_organization = params[:your_organization]settings << { setting_name: "company_name", value: your_organization[:company_name] }+ settings << { setting_name: "company_url", value: your_organization[:company_url] }settings << { setting_name: "governing_law", value: your_organization[:governing_law] }settings << {setting_name: "city_for_disputes",diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex ced1281538e..f151ae5d078 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -7601,9 +7601,11 @@ en:your_organization: "Your organization"your_organization_description: "We'll use this information in the Terms of Service and Privacy Notice to show who operates the site and under which jurisdiction."company_name: "Name"- company_name_placeholder: "Acme Organization"+ company_name_placeholder: "ExampleCo"company_name_warning: |If left blank, no boilerplate Terms of Service or Privacy Notice will be provided.+ company_url: "Website"+ company_url_placeholder: "https://example-co.com"governing_law: "Governing law"governing_law_placeholder: "Province, State, or Country"governing_law_help: |diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex b76d73fa7ea..c22768b4442 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -2781,6 +2781,7 @@ en:default_watched_precedence_over_muted: "Notify users about topics in categories or tags that they are watching that also belong to one they have muted"company_name: "Name of your company or organization. If left blank, no boilerplate Terms of Service or Privacy Notice will be provided."+ company_url: "Website URL for your company or organization. Optional."governing_law: "Specify the jurisdiction that governs the legal aspects of the site, including Terms of Service and Privacy Policy. This is typically the country or state where the company operating the site is registered or conducts business."city_for_disputes: "Specify the city that will be used as the jurisdiction for resolving any disputes related to the use of this forum. This information is typically included in legal documents such as the forum's Terms of Service."diff --git a/config/site_settings.yml b/config/site_settings.ymlindex c5d43571bdc..fa927765568 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -122,6 +122,9 @@ required:company_name:default: ""area: "about|legal"+ company_url:+ default: ""+ area: "about|legal"governing_law:default: ""area: "about|legal"diff --git a/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs b/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjsindex 4a12b3e57ef..09e0372a32b 100644--- a/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs+++ b/frontend/discourse/admin/components/admin-config-area-cards/about/your-organization.gjs@@ -14,6 +14,7 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {get data() {return {companyName: this.args.yourOrganization.companyName.value,+ companyURL: this.args.yourOrganization.companyURL.value,governingLaw: this.args.yourOrganization.governingLaw.value,cityForDisputes: this.args.yourOrganization.cityForDisputes.value,};@@ -28,6 +29,7 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {data: {your_organization: {company_name: data.companyName,+ company_url: data.companyURL,governing_law: data.governingLaw,city_for_disputes: data.cityForDisputes,},@@ -67,6 +69,20 @@ export default class AdminConfigAreasAboutYourOrganization extends Component {{{i18n "admin.config_areas.about.company_name_warning"}}</form.Alert>+ <form.Field+ @name="companyURL"+ @title={{i18n "admin.config_areas.about.company_url"}}+ @format="large"+ @type="input-url"+ as |field|+ >+ <field.Control+ placeholder={{i18n+ "admin.config_areas.about.company_url_placeholder"+ }}+ />+ </form.Field>+<form.Field@name="governingLaw"@title={{i18n "admin.config_areas.about.governing_law"}}diff --git a/frontend/discourse/admin/components/admin-config-areas/about.gjs b/frontend/discourse/admin/components/admin-config-areas/about.gjsindex 3f17a9bf531..d5cd9f94a0f 100644--- a/frontend/discourse/admin/components/admin-config-areas/about.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/about.gjs@@ -35,6 +35,7 @@ export default class AdminConfigAreasAbout extends Component {get yourOrganization() {return {companyName: this.#lookupSettingFromData("company_name"),+ companyURL: this.#lookupSettingFromData("company_url"),governingLaw: this.#lookupSettingFromData("governing_law"),cityForDisputes: this.#lookupSettingFromData("city_for_disputes"),};diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rbindex a9116f3d53b..9ac6527e338 100644--- a/spec/models/site_setting_spec.rb+++ b/spec/models/site_setting_spec.rb@@ -187,7 +187,7 @@ RSpec.describe SiteSetting doendit "includes only settings for the specified category" do- expect(SiteSetting.all_settings(filter_categories: ["required"]).count).to eq(12)+ expect(SiteSetting.all_settings(filter_categories: ["required"]).count).to eq(13)endenddiff --git a/spec/system/admin_about_config_area_spec.rb b/spec/system/admin_about_config_area_spec.rbindex 505a271a79e..15910ec3c7d 100644--- a/spec/system/admin_about_config_area_spec.rb+++ b/spec/system/admin_about_config_area_spec.rb@@ -27,6 +27,7 @@ describe "Admin About Config Area Page" doSiteSetting.site_contact_group_name = admin.groups.first.nameSiteSetting.company_name = "kitty company inc."+ SiteSetting.company_url = "https://kitty.company"SiteSetting.governing_law = "kitty jurisdiction"SiteSetting.city_for_disputes = "no disputes allowed"@@ -70,6 +71,9 @@ describe "Admin About Config Area Page" doexpect(config_area.your_organization_section.company_name_input.value).to eq("kitty company inc.",)+ expect(config_area.your_organization_section.company_url_input.value).to eq(+ "https://kitty.company",+ )expect(config_area.your_organization_section.governing_law_input.value).to eq("kitty jurisdiction",)@@ -223,6 +227,7 @@ describe "Admin About Config Area Page" doconfig_area.visitconfig_area.your_organization_section.company_name_input.fill_in("lil' company")+ config_area.your_organization_section.company_url_input.fill_in("https://lil.company")config_area.your_organization_section.governing_law_input.fill_in("wild west law")config_area.your_organization_section.city_for_disputes_input.fill_in("teeb el shouq")@@ -230,6 +235,7 @@ describe "Admin About Config Area Page" doexpect(config_area.your_organization_section).to have_saved_successfullyexpect(SiteSetting.company_name).to eq("lil' company")+ expect(SiteSetting.company_url).to eq("https://lil.company")expect(SiteSetting.governing_law).to eq("wild west law")expect(SiteSetting.city_for_disputes).to eq("teeb el shouq")enddiff --git a/spec/system/page_objects/components/admin_about_config_area_your_organization_card.rb b/spec/system/page_objects/components/admin_about_config_area_your_organization_card.rbindex 83c4e575887..1c1fcbfa59d 100644--- a/spec/system/page_objects/components/admin_about_config_area_your_organization_card.rb+++ b/spec/system/page_objects/components/admin_about_config_area_your_organization_card.rb@@ -7,6 +7,10 @@ module PageObjectsform.field("companyName")end+ def company_url_input+ form.field("companyURL")+ end+def governing_law_inputform.field("governingLaw")end