From 4e80372ac69a593c53f047a53753cd8b0401cf71 Mon Sep 17 00:00:00 2001 From: AnkushMalik Date: Tue, 9 Jan 2018 17:21:14 +0530 Subject: [PATCH 1/4] Change paths of buttons on conference show page Update path of track submission btn to track#new and proposal submission to proposal#new Closes #1813 --- app/views/conferences/_call_for_papers.haml | 2 +- app/views/conferences/_call_for_tracks.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/conferences/_call_for_papers.haml b/app/views/conferences/_call_for_papers.haml index 3bf0f295..b47d7118 100644 --- a/app/views/conferences/_call_for_papers.haml +++ b/app/views/conferences/_call_for_papers.haml @@ -23,5 +23,5 @@ left! %p.cta-button = link_to "Submit your proposal now", - conference_program_proposals_path(conference_id), + new_conference_program_proposal_path(conference_id), class: 'btn btn-success btn-lg text-center' diff --git a/app/views/conferences/_call_for_tracks.haml b/app/views/conferences/_call_for_tracks.haml index 7eb80fa6..6d78bd05 100644 --- a/app/views/conferences/_call_for_tracks.haml +++ b/app/views/conferences/_call_for_tracks.haml @@ -15,5 +15,5 @@ left! %p.cta-button = link_to("Submit your request for track", - conference_program_tracks_path(conference_id), + new_conference_program_track_path(conference_id), class: 'btn btn-success btn-lg text-center') From b7015b7d26f35af113a1d7c323a74ca3437fd000 Mon Sep 17 00:00:00 2001 From: Vincent Misson Date: Sat, 9 Dec 2017 01:00:16 +0100 Subject: [PATCH 2/4] Fix example file to work with docker mailhog Issue seems to be link with this commit : https://github.com/openSUSE/osem/commit/da735fe1c9b9e685cb9b87987f3048cfebbe7a3e More information here : https://github.com/openSUSE/osem/issues/1863 --- docker-compose.env.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.env.example b/docker-compose.env.example index 905ff612..14f35abd 100644 --- a/docker-compose.env.example +++ b/docker-compose.env.example @@ -32,9 +32,9 @@ SECRET_KEY_BASE=changemechangemechangeme" # you should comment out or remove the mailhog service from docker-compose.yml, # too OSEM_EMAIL_ADDRESS="osem@mailhog" -OSEM_SMTP_AUTHENTICATION="login" -OSEM_SMTP_ADDRESS="mailhog" -OSEM_SMTP_PORT="1025" +OSEM_SMTP_AUTHENTICATION=login +OSEM_SMTP_ADDRESS=mailhog +OSEM_SMTP_PORT=1025 OSEM_SMTP_USERNAME="mailhog" OSEM_SMTP_PASSWORD="mailhog" From f0a8f2b74c28a098715d2df3e1ab08354f88b94f Mon Sep 17 00:00:00 2001 From: Vincent Misson Date: Tue, 9 Jan 2018 10:25:39 +0100 Subject: [PATCH 3/4] Fix example file #update Remove only the quotes for OSEM_SMTP_PORT as it's an integer --- docker-compose.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.env.example b/docker-compose.env.example index 14f35abd..7bda181b 100644 --- a/docker-compose.env.example +++ b/docker-compose.env.example @@ -32,8 +32,8 @@ SECRET_KEY_BASE=changemechangemechangeme" # you should comment out or remove the mailhog service from docker-compose.yml, # too OSEM_EMAIL_ADDRESS="osem@mailhog" -OSEM_SMTP_AUTHENTICATION=login -OSEM_SMTP_ADDRESS=mailhog +OSEM_SMTP_AUTHENTICATION="login" +OSEM_SMTP_ADDRESS="mailhog" OSEM_SMTP_PORT=1025 OSEM_SMTP_USERNAME="mailhog" OSEM_SMTP_PASSWORD="mailhog" From e6be579566b40af87ce7731ed1072b519b38feb8 Mon Sep 17 00:00:00 2001 From: Marie-Elise Date: Mon, 8 Jan 2018 20:23:14 -0600 Subject: [PATCH 4/4] Updated user's booth edit path in booth#show file. --- app/views/booths/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/booths/show.html.haml b/app/views/booths/show.html.haml index 6b12229d..f1790504 100644 --- a/app/views/booths/show.html.haml +++ b/app/views/booths/show.html.haml @@ -6,7 +6,7 @@ = image_tag(@booth.picture.thumb.url, size: '20%', alt: '') = @booth.title .btn-group.pull-right - = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary' + = link_to 'Edit', edit_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary' .row .col-md-12