From 33d975514f4bcf3bf3b908912a2b1d0082013c96 Mon Sep 17 00:00:00 2001 From: BelieveC Date: Tue, 7 Feb 2017 01:40:28 +0530 Subject: [PATCH] Fix Update page page: Requirement field fixed to collapse for empty description --- Vagrantfile | 5 ++++- app/views/proposals/_proposal_form.html.haml | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 827cb8ed..b10220dd 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -22,7 +22,7 @@ Vagrant.configure(2) do |config| # Create a forwarded port mapping which allows access to a specific port # within the machine from a port on the host machine. In the example below, # accessing "localhost:8080" will access port 80 on the guest machine. - config.vm.network "forwarded_port", guest: 3000, host: 3000 + config.vm.network "forwarded_port", guest: 3000, host: 1234 # Create a private network, which allows host-only access to the machine # using a specific IP. @@ -69,4 +69,7 @@ Vagrant.configure(2) do |config| # sudo apt-get update # sudo apt-get install -y apache2 # SHELL + config.proxy.http = "http://iit2015120:Cway9421584659@172.31.1.4:8080" + config.proxy.https = "https://iit2015120:Cway9421584659@172.31.1.4:8080" + config.proxy.no_proxy = "localhost,127.0.0.1" end diff --git a/app/views/proposals/_proposal_form.html.haml b/app/views/proposals/_proposal_form.html.haml index ed8d3c02..f7f11e9c 100644 --- a/app/views/proposals/_proposal_form.html.haml +++ b/app/views/proposals/_proposal_form.html.haml @@ -55,7 +55,11 @@ %p.text-right = link_to '#description', 'data-toggle' => 'collapse' do Do you require something special? - .collapse#description + -if @event.description.blank? + .collapse#description + = f.input :description, input_html: { rows: 5 }, label: 'Requirements', placeholder: 'Eg. Whiteboard, printer, or something like that.' + -else + .collapse.in#description = f.input :description, input_html: { rows: 5 }, label: 'Requirements', placeholder: 'Eg. Whiteboard, printer, or something like that.'