Unverified Commit a73e2edc authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

profile: use effective visibility from journey object

parent 4f54597c

lib/Travelynx/Controller/Profile.pm

+20 −24
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ sub profile { 
		  ( $inverse_relation and $inverse_relation eq 'requests_follow' ) ? 1

		: 0,

		journey  => $status,

		journey_visibility => $visibility,

		journeys => [@journeys],

	);

}
@@ -370,7 +369,6 @@ sub journey_details { 
		readonly  => 1,

		twitter   => \%tw_data,

		opengraph => \%og_data,

		journey_visibility => $visibility,

		%{$map_data},

	);

}
@@ -546,7 +544,6 @@ sub user_status { 
			name      => $name,

			privacy   => $user,

			journey   => $status,

			journey_visibility => $visibility,

			twitter   => \%tw_data,

			opengraph => \%og_data,

			version   => $self->app->config->{version} // 'UNKNOWN',
@@ -629,7 +626,6 @@ sub status_card { 
		name         => $name,

		privacy      => $user,

		journey      => $status,

		journey_visibility => $visibility,

		from_profile => $self->param('profile') ? 1 : 0,

	);

}

templates/_public_status_card.html.ep

+1 −3
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ 
				% else {

					<a href="/p/<%= $name %>"><%= $name %></a> ist unterwegs

				% }

				% if ($journey_visibility) {

					<i class="material-icons right"><%= visibility_icon($journey_visibility) %></i>

				% }

				<i class="material-icons right"><%= visibility_icon($journey->{effective_visibility_str}) %></i>

			</span>

			% if ($privacy->{comments_visible} and $journey->{comment}) {

				<p>„<%= $journey->{comment} %>“</p>

templates/profile.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
</div>

<div class="row">

	<div class="col s12 publicstatuscol" data-user="<%= $name %>" data-profile="1">

		%= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey, journey_visibility => $journey_visibility, from_profile => 1

		%= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey, from_profile => 1

	</div>

</div>

% if ($journeys and @{$journeys}) {

templates/user_status.html.ep

+1 −1
Original line number Diff line number Diff line 
<div class="row">

	<div class="col s12 publicstatuscol" data-user="<%= $name %>">

		%= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey, journey_visibility => $journey_visibility

		%= include '_public_status_card', name => $name, privacy => $privacy, journey => $journey

	</div>

</div>