I read and accept the #{link_to name, agreement_url, target: '_blank'} agreement.
".html_safe + markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true) + markdown.render(agreement).gsub(" '1' } .form-actions = f.button :submit, class: 'btn-primary' diff --git a/app/views/manage/agreements/index.html.haml b/app/views/manage/agreements/index.html.haml index 1907f6f36..be0c560ac 100644 --- a/app/views/manage/agreements/index.html.haml +++ b/app/views/manage/agreements/index.html.haml @@ -12,7 +12,7 @@ %th = t(:name, scope: 'pages.manage.agreements') %th - = t(:agreement_url, scope: 'pages.manage.agreements') + = t(:agreement, scope: 'pages.manage.agreements') %tbody - @agreements.each do |agreement| @@ -25,4 +25,4 @@ %strong = agreement.name %td - = agreement.agreement_url + = markdown(agreement.agreement) diff --git a/config/locales/en.yml b/config/locales/en.yml index 2ec73ca7e..e942e663f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -54,8 +54,6 @@ en: trigger: Sent automatically when a new or updated applicant matches this criteria. Does not send to anyone already matching this criteria. school: is_home: The "home" school is separated from all other schools on dashboard metrics. - agreement: - name: 'Agreements are displayed to applicants as: "I read & accept the [agreement_name] agreement"' hackathon_config: accepting_questionnaires: Specify and allow questionnaires to be accepted. digital_hackathon: Optimize HackathonManager for a digital hackathon. (Removes travel, dietary restrictions, etc.) @@ -192,7 +190,7 @@ en: title: Legal Agreements notice: "These are legal agreements that are required to be reviewed and agreed upon by all applicants of %{hackathon_name}." name: Name - agreement_url: Agreement URL + agreement: Agreement new: New Agreement edit: Edit Agreement settings: diff --git a/db/migrate/20201218010133_convert_agreements_to_text.rb b/db/migrate/20201218010133_convert_agreements_to_text.rb new file mode 100644 index 000000000..81200ef7e --- /dev/null +++ b/db/migrate/20201218010133_convert_agreements_to_text.rb @@ -0,0 +1,11 @@ +class ConvertAgreementsToText < ActiveRecord::Migration[5.2] + def self.up + change_column :agreements, :agreement_url, :text + rename_column :agreements, :agreement_url, :agreement + end + + def self.down + rename_column :agreements, :agreement, :agreement_url + change_column :agreements, :agreement_url, :sring + end +end diff --git a/db/schema.rb b/db/schema.rb index 5d5d5831b..f50a277c0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_12_09_053827) do +ActiveRecord::Schema.define(version: 2020_12_18_010133) do create_table "active_storage_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.string "name", null: false @@ -35,7 +35,7 @@ create_table "agreements", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.string "name" - t.string "agreement_url" + t.text "agreement" t.datetime "created_at", null: false t.datetime "updated_at", null: false end @@ -73,7 +73,9 @@ t.integer "query_id" t.text "statement" t.string "data_source" - t.datetime "created_at" + t.timestamp "created_at" + t.index ["query_id"], name: "index_blazer_audits_on_query_id" + t.index ["user_id"], name: "index_blazer_audits_on_user_id" end create_table "blazer_checks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| @@ -84,9 +86,11 @@ t.text "emails" t.string "check_type" t.text "message" - t.datetime "last_run_at" + t.timestamp "last_run_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["creator_id"], name: "index_blazer_checks_on_creator_id" + t.index ["query_id"], name: "index_blazer_checks_on_query_id" end create_table "blazer_dashboard_queries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| @@ -95,6 +99,8 @@ t.integer "position" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["dashboard_id"], name: "index_blazer_dashboard_queries_on_dashboard_id" + t.index ["query_id"], name: "index_blazer_dashboard_queries_on_query_id" end create_table "blazer_dashboards", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| @@ -102,6 +108,7 @@ t.text "name" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["creator_id"], name: "index_blazer_dashboards_on_creator_id" end create_table "blazer_queries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| @@ -112,6 +119,7 @@ t.string "data_source" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["creator_id"], name: "index_blazer_queries_on_creator_id" end create_table "bus_lists", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| @@ -151,9 +159,9 @@ t.string "subject" t.string "recipients" t.text "body" - t.datetime "queued_at" - t.datetime "started_at" - t.datetime "delivered_at" + t.timestamp "queued_at" + t.timestamp "started_at" + t.timestamp "delivered_at" t.datetime "created_at" t.datetime "updated_at" t.string "template", default: "default" diff --git a/test/controllers/manage/agreements_controller_test.rb b/test/controllers/manage/agreements_controller_test.rb index 9cc4d441b..75fc3a928 100644 --- a/test/controllers/manage/agreements_controller_test.rb +++ b/test/controllers/manage/agreements_controller_test.rb @@ -191,7 +191,7 @@ class Manage::AgreementsControllerTest < ActionController::TestCase end should "create a new agreement" do - post :create, params: { agreement: { name: "Fun Agreement", agreement_url: "https://foo.com" } } + post :create, params: { agreement: { name: "Fun Agreement", agreement: "Please read and accept https://foo.com" } } assert_response :redirect end @@ -206,11 +206,6 @@ class Manage::AgreementsControllerTest < ActionController::TestCase assert_redirected_to manage_agreements_path end - should "enforce agreement_url to be a link" do - patch :update, params: { id: @agreement, agreement: { name: "New agreement Name", agreement_url: "hello" } } - assert_response :redirect - end - context "#destroy" do should "destroy agreement" do assert_difference("Agreement.count", -1) do diff --git a/test/factories/agreement.rb b/test/factories/agreement.rb index ad1d8909c..bbe59cc70 100644 --- a/test/factories/agreement.rb +++ b/test/factories/agreement.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :agreement do name { "HackFoo Agreement" } - agreement_url { "https://www.foo.com" } + agreement { "Please read and accept https://www.foo.com" } end end diff --git a/test/models/agreement_test.rb b/test/models/agreement_test.rb index 2ffddab95..ee09a3ae2 100644 --- a/test/models/agreement_test.rb +++ b/test/models/agreement_test.rb @@ -4,10 +4,10 @@ class AgreementTest < ActiveSupport::TestCase should have_and_belong_to_many :questionnaires should strip_attribute :name - should strip_attribute :agreement_url + should strip_attribute :agreement should validate_presence_of :name - should validate_presence_of :agreement_url + should validate_presence_of :agreement should "not allow questionnaires to accept agreements for others" do @questionnaire1 = create(:questionnaire)