diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index b58258076..aeea38e05 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -26,7 +26,7 @@ class RequestsController < ApplicationController def create url = diaspora_url(params[:request][:destination_url]) - @request = current_user.send_friend_request_to(url) unless url.include?('@') + @request = current_user.send_friend_request_to(url) unless url.include?('@')|| url == '' if @request flash[:notice] = "a friend request was sent to #{@request.destination_url}" redirect_to requests_url diff --git a/app/views/requests/_form.haml b/app/views/requests/_form.haml index 390062d8d..319265e29 100644 --- a/app/views/requests/_form.haml +++ b/app/views/requests/_form.haml @@ -5,6 +5,5 @@ = f.label :destination_url = f.text_field :destination_url - %p = f.submit diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml index 319265e29..d44bdcea0 100644 --- a/app/views/requests/_new_request.haml +++ b/app/views/requests/_new_request.haml @@ -2,8 +2,8 @@ = f.error_messages %p + enter a diaspora url, diaspora username, or random email address: = f.label :destination_url = f.text_field :destination_url - %p = f.submit