Merge branch 'master' of git.framasoft.org:agenda-libre/agenda-libre-ruby

This commit is contained in:
echarp 2018-11-08 21:07:40 +01:00
commit 763b0a2d65
2 changed files with 3 additions and 3 deletions

View File

@ -66,7 +66,7 @@ ActiveRecord::Schema.define(version: 20180408212139) do
t.string "contact", limit: 255, default: "" t.string "contact", limit: 255, default: ""
t.string "submitter", limit: 255, default: "", null: false t.string "submitter", limit: 255, default: "", null: false
t.integer "moderated", limit: 4, default: 0, null: false t.integer "moderated", limit: 4, default: 0, null: false
t.text "tags", limit: 255, default: "" t.text "tags", limit: 255, null: true
t.string "secret", limit: 255, default: "", null: false t.string "secret", limit: 255, default: "", null: false
t.datetime "decision_time" t.datetime "decision_time"
t.datetime "submission_time" t.datetime "submission_time"
@ -119,7 +119,7 @@ ActiveRecord::Schema.define(version: 20180408212139) do
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.text "tag" t.text "tag"
t.text "tags", default: "" t.text "tags", null: true
t.text "diaspora" t.text "diaspora"
t.text "object_changes" t.text "object_changes"
t.text "place_name" t.text "place_name"

View File

@ -356,7 +356,7 @@ def SubmitEvent(event, testOutputFile):
sys.exit(0) sys.exit(0)
fp = open(testOutputFile, "w") fp = open(testOutputFile, "w")
s = contents.getvalue().decode() s = contents.getvalue().decode()
s = re.sub(r'href="([A-Za-z0-9]*).css"', r'href="'+baseUrl+'\1.css"', s) s = re.sub(r'<head.*>', r'\g<0><base href="%s">' % baseUrl, s, flags=re.IGNORECASE)
fp.write(s) fp.write(s)
fp.close() fp.close()