From 8b5a1cd20f763b1eba7f1e4f9510fed5b7d4a849 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 29 Sep 2014 16:59:03 -0400 Subject: [PATCH] Migrate `tosAccepted` to new user fields --- .../discourse/controllers/create-account.js.es6 | 8 +------- .../templates/components/user-fields/confirm.hbs | 2 +- .../templates/components/user-fields/text.hbs | 2 +- .../discourse/templates/modal/create-account.hbs | 8 -------- app/controllers/application_controller.rb | 4 ---- app/models/site_text.rb | 1 - config/locales/server.en.yml | 4 ---- config/site_settings.yml | 3 --- db/migrate/20140929204155_migrate_tos_setting.rb | 16 ++++++++++++++++ 9 files changed, 19 insertions(+), 29 deletions(-) create mode 100644 db/migrate/20140929204155_migrate_tos_setting.rb diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index 56e8aadfa..7d846513b 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -14,7 +14,6 @@ export default DiscourseController.extend(ModalFunctionality, { rejectedEmails: Em.A([]), rejectedPasswords: Em.A([]), prefilledUsername: null, - tosAccepted: false, userFields: null, hasAuthOptions: Em.computed.notEmpty('authOptions'), @@ -42,9 +41,6 @@ export default DiscourseController.extend(ModalFunctionality, { }, submitDisabled: function() { - // Even if password is required, we respect the tos setting - if (this.get('tosAcceptRequired') && !this.get('tosAccepted')) return true; - if (!this.get('passwordRequired')) return false; // 3rd party auth if (this.get('formSubmitted')) return true; if (this.get('nameValidation.failed')) return true; @@ -62,7 +58,7 @@ export default DiscourseController.extend(ModalFunctionality, { if (anyEmpty) { return true; } } return false; - }.property('passwordRequired', 'nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed', 'formSubmitted', 'tosAccepted', 'userFields.@each.value'), + }.property('passwordRequired', 'nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed', 'formSubmitted', 'userFields.@each.value'), passwordRequired: function() { return this.blank('authOptions.auth_provider'); @@ -343,8 +339,6 @@ export default DiscourseController.extend(ModalFunctionality, { }); }, - tosAcceptRequired: Discourse.computed.setting('tos_accept_required'), - actions: { externalLogin: function(provider) { this.get('controllers.login').send('externalLogin', provider); diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs index a6164962e..3e300a379 100644 --- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs @@ -1,3 +1,3 @@ diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs index 10b4461de..6d7234bc6 100644 --- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs @@ -1,4 +1,4 @@ diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs index ff5975a5e..05bb8a412 100644 --- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs +++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs @@ -88,14 +88,6 @@ {{#if showCreateForm}}
- {{#if tosAcceptRequired}} -
- -
- {{/if}} {{#if formSubmitted}}   diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bb27e8c24..758d65684 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -260,10 +260,6 @@ class ApplicationController < ActionController::Base bottom: SiteText.text_for(:bottom) } - if SiteSetting.tos_accept_required && !current_user - data[:tos_signup_form_message] = SiteText.text_for(:tos_signup_form_message) - end - if DiscoursePluginRegistry.custom_html data.merge! DiscoursePluginRegistry.custom_html end diff --git a/app/models/site_text.rb b/app/models/site_text.rb index e5328d79d..994eacca2 100644 --- a/app/models/site_text.rb +++ b/app/models/site_text.rb @@ -15,7 +15,6 @@ class SiteText < ActiveRecord::Base add_text_type :education_new_topic, default_18n_key: 'education.new-topic' add_text_type :education_new_reply, default_18n_key: 'education.new-reply' add_text_type :login_required_welcome_message, default_18n_key: 'login_required.welcome_message' - add_text_type :tos_signup_form_message, default_18n_key: 'terms_of_service.signup_form_message', format: :html add_text_type :top, allow_blank: true, format: :html add_text_type :bottom, allow_blank: true, format: :html add_text_type :head, allow_blank: true, format: :html diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ea4402a96..62500b33a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -626,9 +626,6 @@ en: bottom: title: "Bottom of the pages" description: "HTML that will be added at the bottom of every page." - tos_signup_form_message: - title: "Signup Form: Terms of Service Message" - description: "The message that will appear beside a checkbox on the signup form if the tos_accept_required site setting is enabled." notification_email_top: title: "Notification Email Top" description: "A message that will be displayed at the top of all notification emails." @@ -998,7 +995,6 @@ en: embed_post_limit: "Maximum number of posts to embed." embed_whitelist_selector: "CSS selector for elements that are allowed in embeds." embed_blacklist_selector: "CSS selector for elements that are removed from embeds." - tos_accept_required: "If enabled, users will need to check a box on the signup form to confirm that they accept the terms of service. Edit 'Signup Form: Terms of Service Message' in the Content tab to change the message." notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send an email to the contact_email. Set to 0 to disable." enable_cdn_js_debugging: "Allow /logs to display proper errors by adding crossorigin permissions on all js includes." show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics." diff --git a/config/site_settings.yml b/config/site_settings.yml index 111632464..b796b2920 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -632,9 +632,6 @@ legal: privacy_policy_url: client: true default: '' - tos_accept_required: - client: true - default: false faq_url: client: true default: '' diff --git a/db/migrate/20140929204155_migrate_tos_setting.rb b/db/migrate/20140929204155_migrate_tos_setting.rb new file mode 100644 index 000000000..7a6d1a3be --- /dev/null +++ b/db/migrate/20140929204155_migrate_tos_setting.rb @@ -0,0 +1,16 @@ +class MigrateTosSetting < ActiveRecord::Migration + def up + res = execute("SELECT * FROM site_settings WHERE name = 'tos_accept_required' AND value = 't'") + if res.present? && res[0].present? + label = I18n.t("terms_of_service.signup_form_message") + res = execute("SELECT value FROM site_texts WHERE text_type = 'tos_signup_form_message'") + if res.present? && res.cmd_tuples == 1 + label = res[0]['value'] + end + + + label = PG::Connection.escape_string(label) + execute("INSERT INTO user_fields (name, field_type, editable) VALUES ('#{label}', 'confirm', false)") + end + end +end