localhots
/
oldhaven
1
0
Fork 0
Code Releases Activity

Bad artist name error fix. showing 404

This commit is contained in:
magnolia-fan 2011-04-13 17:40:24 +04:00
parent 970400cb74
commit 07920d2b79
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/artist_controller.rb
View File

@ -2,13 +2,17 @@
class ArtistController < ApplicationController class ArtistController < ApplicationController
require 'open-uri' require 'open-uri'
def view def view
# Dirty auth block START
unless request.session['session_id'].nil? or MainController.logged_in request.session['session_id'] unless request.session['session_id'].nil? or MainController.logged_in request.session['session_id']
redirect_to '/login' redirect_to '/login'
return
else else
if request.session['session_id'].nil? if request.session['session_id'].nil?
redirect_to '/login' redirect_to '/login'
return
end end
end end
# Dirty auth block END
if params[:name].nil? if params[:name].nil?
name = '' name = ''
else else
@ -18,6 +22,9 @@ class ArtistController < ApplicationController
name = params[:name].gsub('+', ' ') name = params[:name].gsub('+', ' ')
end end
@artist = Artist.getByName(name) @artist = Artist.getByName(name)
if @artist.nil?
render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false
else
@albums = [] @albums = []
@artist.albums.each do |album| @artist.albums.each do |album|
unless album.releases.empty? unless album.releases.empty?
@ -29,7 +36,7 @@ class ArtistController < ApplicationController
end end
end end
end end
end
def autocomplete def autocomplete
autocomplete = Artist.getLastFmAutocomplete(params[:query]) autocomplete = Artist.getLastFmAutocomplete(params[:query])
return render :nothing => true if autocomplete.nil? return render :nothing => true if autocomplete.nil?