Commit 6fea4507 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Dennis Schubert

Fix mobile photos index page

closes #6243
parent 2a3dde1a
......@@ -29,6 +29,7 @@
* Fix mobile more-button wording when there are less than 15 posts [#6118](https://github.com/diaspora/diaspora/pull/6118)
* Fix reappearing flash boxes during sign-in [#6146](https://github.com/diaspora/diaspora/pull/6146)
* Capitalize Wiki link [#6193](https://github.com/diaspora/diaspora/pull/6193)
* Fix mobile photos index page [#6243](https://github.com/diaspora/diaspora/pull/6243)
## Features
* Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)
......
......@@ -34,6 +34,7 @@ class PhotosController < ApplicationController
}
render "people/show", layout: "with_header"
end
format.mobile { render "people/show" }
format.json{ render_for_api :backbone, :json => @posts, :root => :photos }
end
else
......
......@@ -18,17 +18,17 @@
= Diaspora::Taggable.format_tags(@person.tag_string)
.span12.profile_stream
- if @stream.stream_posts.length > 0
- if @post_type == :photos
= render 'photos/index', :photos => @stream.stream_posts
- else
#main_stream.stream
= render 'shared/stream', :posts => @stream.stream_posts
= render 'shared/stream_more_button'
- if @post_type == :photos
= render "photos/index", photos: @posts
- else
#main_stream
.dull
- if @block.present?
= t('.ignoring', :name => @person.first_name)
- elsif user_signed_in? && (current_user.person != @person)
= t('.has_not_shared_with_you_yet', :name => @person.first_name)
- if @stream.stream_posts.length > 0
#main_stream.stream
= render "shared/stream", posts: @stream.stream_posts
= render "shared/stream_more_button"
- else
#main_stream
.dull
- if @block.present?
= t(".ignoring", name: @person.first_name)
- elsif user_signed_in? && (current_user.person != @person)
= t(".has_not_shared_with_you_yet", name: @person.first_name)
......@@ -82,6 +82,16 @@ describe PhotosController, :type => :controller do
expect(response).to be_success
end
it "succeeds on mobile devices without any available pictures" do
get :index, format: :mobile, person_id: FactoryGirl.create(:person).guid.to_s
expect(response).to be_success
end
it "succeeds on mobile devices with available pictures" do
get :index, format: :mobile, person_id: bob.person.guid.to_s
expect(response).to be_success
end
it "displays the logged in user's pictures" do
get :index, :person_id => alice.person.guid.to_s
expect(assigns[:person]).to eq(alice.person)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment