Author: acid2
Date: 2009-06-29 16:37:11 +0000 (Mon, 29 Jun 2009)
New Revision: 11793
Modified:
mb_server/trunk/lib/MusicBrainz/Server/Controller/Annotation.pm
mb_server/trunk/lib/MusicBrainz/Server/Controller/Artist.pm
mb_server/trunk/lib/MusicBrainz/Server/Controller/Label.pm
Log:
Minor fixes to allow controllers to continue working when users are logged in
Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Annotation.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Annotation.pm 2009-06-29 16:15:41 UTC (rev 11792)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Annotation.pm 2009-06-29 16:37:11 UTC (rev 11793)
@@ -21,6 +21,18 @@
$c->model($self->{model})->annotation->load_latest($c->stash->{$self->{entity_name}});
};
+sub edit_annotation : Chained('load') PathPart
+{
+ my ($self, $c) = @_;
+ $c->detach('/error_404')
+}
+
+sub annotation_history : Chained('load') PathPart
+{
+ my ($self, $c) = @_;
+ $c->detach('/error_404');
+}
+
no Moose::Role;
1;
Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Artist.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Artist.pm 2009-06-29 16:15:41 UTC (rev 11792)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Artist.pm 2009-06-29 16:37:11 UTC (rev 11793)
@@ -63,12 +63,6 @@
$c->detach('/error_404');
}
- if ($c->user_exists)
- {
- $c->stash->{subscribed} = $c->model('Subscription')->
- is_user_subscribed_to_entity($c->user, $c->stash->{artist});
- }
-
$c->model('ArtistType')->load($c->stash->{artist});
$c->model('Gender')->load($c->stash->{artist});
$c->model('Country')->load($c->stash->{artist});
Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Label.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Label.pm 2009-06-29 16:15:41 UTC (rev 11792)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Label.pm 2009-06-29 16:37:11 UTC (rev 11793)
@@ -43,12 +43,6 @@
$c->detach('/error_404');
}
- if ($c->user_exists)
- {
- $c->stash->{subscribed} = $c->model('Subscription')->
- is_user_subscribed_to_entity($c->user, $c->stash->{label});
- }
-
$c->model('LabelType')->load($c->stash->{label});
};
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
