nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix message modal on profile page

Browse source 
closes #7137

fixes #7136
This commit is contained in:
Steffen van Bergerem 2016-10-03 00:54:34 +02:00 committed by Benjamin Neff
parent ac08e9351b
commit 74fff52e51
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -34,6 +34,7 @@ Note: Although this is a minor release, the configuration file changed because t
* Clicking photos on mobile should no longer cause 404s [#7071](https://github.com/diaspora/diaspora/pull/7071) * Clicking photos on mobile should no longer cause 404s [#7071](https://github.com/diaspora/diaspora/pull/7071)
* Fix avatar size on mobile privacy page for ignored people [#7148](https://github.com/diaspora/diaspora/pull/7148) * Fix avatar size on mobile privacy page for ignored people [#7148](https://github.com/diaspora/diaspora/pull/7148)
* Don't display tag following button when logged out [#7155](https://github.com/diaspora/diaspora/pull/7155) * Don't display tag following button when logged out [#7155](https://github.com/diaspora/diaspora/pull/7155)
* Fix message modal on profile page[#7137](https://github.com/diaspora/diaspora/pull/7137)
## Features ## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

1
app/views/conversations/new.html.haml
View file

@ -2,6 +2,7 @@
$(document).ready(function () { $(document).ready(function () {
var data = $.parseJSON( "#{escape_javascript(@contacts_json)}" ); var data = $.parseJSON( "#{escape_javascript(@contacts_json)}" );
new app.views.ConversationsForm({ new app.views.ConversationsForm({
el: $("form#new-conversation").parent(),
contacts: data, contacts: data,
prefillName: "#{h params[:name]}", prefillName: "#{h params[:name]}",
prefillValue: "#{@contact_ids}" prefillValue: "#{@contact_ids}"

12
features/desktop/conversations.feature
View file

@ -44,6 +44,18 @@ Feature: private conversations
Then I should have 2 unread private messages Then I should have 2 unread private messages
And I should have 2 email delivery And I should have 2 email delivery
Scenario: send a message from the profile page
When I sign in as "bob@bob.bob"
And I am on "alice@alice.alice"'s page
And I click on selector "#message_button"
And I fill in "conversation-subject" with "Greetings"
And I fill in "new-message-text" with "hello, alice!"
And I press "Send" within "#conversationModal"
Then I should see "Greetings" within "#conversation-inbox"
And I should see "Greetings" within "#conversation-show"
And "Alice Awesome" should be part of active conversation
And I should see "hello, alice!" within ".stream_container"
Scenario: delete a conversation Scenario: delete a conversation
When I sign in as "bob@bob.bob" When I sign in as "bob@bob.bob"
And I send a message with subject "Greetings" and text "hello, alice!" to "Alice Awesome" And I send a message with subject "Greetings" and text "hello, alice!" to "Alice Awesome"