Skip to content

view contributing files directly rather than redirecting #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2018
Merged

view contributing files directly rather than redirecting #2061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c8477d
end point and link to contributing for dist rather than release
haarg May 22, 2018
92c49ae
view contributing files directly rather than redirecting
haarg May 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions lib/MetaCPAN/Web/Controller/ContributingDoc.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ BEGIN { extends 'MetaCPAN::Web::Controller' }

use List::Util ();

sub index : Chained('/') : PathPart('contributing-to') : CaptureArgs(0) {
sub index : Chained('/') : PathPart('contributing-to') : CaptureArgs(0) { }

sub dist : Chained('index') : PathPart('') : Args(1) {
my ( $self, $c, $dist ) = @_;

my $release = $c->model('API::Release')->find($dist)->get->{release};
if ( $release && $release->{author} && $release->{name} ) {
return $c->forward( 'get', [ $release->{author}, $release->{name} ] );
}
$c->detach('/not_found');
}

sub release : Chained('index') : PathPart('') : Args(2) {
Expand All @@ -26,7 +35,7 @@ sub release : Chained('index') : PathPart('') : Args(2) {
sub get : Private {
my ( $self, $c, @args ) = @_;

my $contributing_re = qr/(CONTRIBUTING|HACKING)/i;
my $contributing_re = qr/CONTRIBUTING|HACKING/i;
my $files
= $c->model('API::Release')->interesting_files(@args)->get->{files};

Expand All @@ -45,12 +54,14 @@ sub get : Private {
$c->detach('/not_found');
}
else {
my $path = join '/' => @$file{qw(author release path)};
if ( $path =~ /\.(pod|pm)$/ ) {
$c->res->redirect( "/pod/release/$path", 301 );
my @path = split m{/}, $file->{path};
if ( $file->{pod_lines} && @{ $file->{pod_lines} } ) {
$c->forward( "/pod/release",
[ $file->{author}, $file->{release}, @path ] );
}
else {
$c->res->redirect( "/source/$path", 301 );
$c->forward( "/source/index",
[ $file->{author}, $file->{release}, @path ] );
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion root/inc/release-info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</li>
<% END %>
<li>
<a class="nopopup" href="/contributing-to/<% [release.author, release.name].join('/') %>"><i class="fa fa-fw fa-plus-circle black"></i>How to Contribute</a>
<a class="nopopup" href="/contributing-to/<% IF permalinks; [release.author, release.name].join('/'); ELSE; release.distribution; END %>"><i class="fa fa-fw fa-plus-circle black"></i>How to Contribute</a>
</li>
<% IF release.resources.repository %>
<li>
Expand Down