diff --git a/critiquebrainz/frontend/templates/search/selector_results.html b/critiquebrainz/frontend/templates/search/selector_results.html
index e90be8090..aea3696c2 100644
--- a/critiquebrainz/frontend/templates/search/selector_results.html
+++ b/critiquebrainz/frontend/templates/search/selector_results.html
@@ -91,5 +91,21 @@
+{% elif type=="label" %}
+
+
+ {{ result['name'] }}
+
+
+ {{ result['type'] or '-' }}
+
+
+ {{ result['country'] or '-' }}
+
+
+
+
+
{% endif %}
{% endfor %}
diff --git a/critiquebrainz/frontend/views/__init__.py b/critiquebrainz/frontend/views/__init__.py
index 1f05d8b3c..51f6c13c4 100644
--- a/critiquebrainz/frontend/views/__init__.py
+++ b/critiquebrainz/frontend/views/__init__.py
@@ -2,6 +2,7 @@
import critiquebrainz.db.exceptions as db_exceptions
ARTIST_REVIEWS_LIMIT = 5
+LABEL_REVIEWS_LIMIT = 5
BROWSE_RELEASE_GROUPS_LIMIT = 20
diff --git a/critiquebrainz/frontend/views/label.py b/critiquebrainz/frontend/views/label.py
new file mode 100644
index 000000000..86a46e43e
--- /dev/null
+++ b/critiquebrainz/frontend/views/label.py
@@ -0,0 +1,54 @@
+from flask import Blueprint, render_template, request
+from werkzeug.exceptions import NotFound
+from flask_login import current_user
+from flask_babel import gettext
+import critiquebrainz.db.review as db_review
+import critiquebrainz.frontend.external.musicbrainz_db.label as mb_label
+import critiquebrainz.frontend.external.musicbrainz_db.exceptions as mb_exceptions
+from critiquebrainz.frontend.views import get_avg_rating, LABEL_REVIEWS_LIMIT
+from critiquebrainz.frontend.forms.rate import RatingEditForm
+
+
+label_bp = Blueprint('label', __name__)
+
+
+@label_bp.route('/
')
+def entity(id):
+ id = str(id)
+ try:
+ label = mb_label.get_label_by_id(id)
+ except mb_exceptions.NoDataFoundException:
+ raise NotFound(gettext("Sorry, we couldn't find a label with that MusicBrainz ID."))
+
+ label_reviews_limit = LABEL_REVIEWS_LIMIT
+ if request.args.get('reviews') == "all":
+ label_reviews_limit = None
+
+ if current_user.is_authenticated:
+ my_reviews, my_count = db_review.list_reviews(
+ entity_id=label['id'],
+ entity_type='label',
+ user_id=current_user.id,
+ )
+ my_review = my_reviews[0] if my_count else None
+ else:
+ my_review = None
+
+ reviews_offset = 0
+ reviews, reviews_count = db_review.list_reviews(
+ entity_id=label['id'],
+ entity_type='label',
+ sort='popularity',
+ limit=label_reviews_limit,
+ offset=reviews_offset,
+ )
+
+ avg_rating = get_avg_rating(label['id'], "label")
+
+ rating_form = RatingEditForm(entity_id=id, entity_type='label')
+ rating_form.rating.data = my_review['rating'] if my_review else None
+
+ return render_template('label/entity.html', id=label['id'], label=label,
+ reviews=reviews, my_review=my_review, reviews_limit=label_reviews_limit,
+ reviews_count=reviews_count, avg_rating=avg_rating, rating_form=rating_form,
+ current_user=current_user)
diff --git a/critiquebrainz/frontend/views/search.py b/critiquebrainz/frontend/views/search.py
index 05dc6d176..a609f8ad4 100644
--- a/critiquebrainz/frontend/views/search.py
+++ b/critiquebrainz/frontend/views/search.py
@@ -16,6 +16,8 @@ def search_wrapper(query, type, offset=None):
count, results = musicbrainz.search_places(query, limit=RESULTS_LIMIT, offset=offset)
elif type == "release-group":
count, results = musicbrainz.search_release_groups(query, limit=RESULTS_LIMIT, offset=offset)
+ elif type == "label":
+ count, results = musicbrainz.search_labels(query, limit=RESULTS_LIMIT, offset=offset)
else:
count, results = 0, []
else:
@@ -46,6 +48,7 @@ def more():
def selector():
release_group = request.args.get('release_group')
artist = request.args.get('artist')
+ label = request.args.get('label')
event = request.args.get('event')
place = request.args.get('place')
type = request.args.get('type')
@@ -56,6 +59,8 @@ def selector():
count, results = musicbrainz.search_release_groups(release_group, limit=RESULTS_LIMIT)
elif artist:
count, results = musicbrainz.search_artists(artist, limit=RESULTS_LIMIT)
+ elif label:
+ count, results = musicbrainz.search_labels(label, limit=RESULTS_LIMIT)
elif event:
count, results = musicbrainz.search_events(event, limit=RESULTS_LIMIT)
elif place:
@@ -65,13 +70,14 @@ def selector():
return render_template('search/selector.html', next=next, type=type,
results=results, count=count, limit=RESULTS_LIMIT,
artist=artist, release_group=release_group, event=event,
- place=place)
+ label=label, place=place)
@search_bp.route('/selector/more')
def selector_more():
artist = request.args.get('artist')
release_group = request.args.get('release_group')
+ label = request.args.get('label')
event = request.args.get('event')
place = request.args.get('place')
type = request.args.get('type')
@@ -82,6 +88,8 @@ def selector_more():
limit=RESULTS_LIMIT, offset=offset)
elif type == 'artist':
count, results = musicbrainz.search_artists(artist, limit=RESULTS_LIMIT, offset=offset)
+ elif type == 'label':
+ count, results = musicbrainz.search_labels(label, limit=RESULTS_LIMIT, offset=offset)
elif type == 'event':
count, results = musicbrainz.search_events(event, limit=RESULTS_LIMIT, offset=offset)
elif type == 'place':
+ {% else %} +
 }})
+ {% endif %}
+
+ {% endfor %}
+  }})
 }})
+ {% if overlay_type %}
+