Merge branch 'feature/TrendingShowUriEncodeShowTitle' into develop

This commit is contained in:
JackDandy 2014-11-15 21:28:59 +00:00
commit 44e0749d1e
2 changed files with 4 additions and 1 deletions

View file

@ -9,6 +9,7 @@
* Change Help and Info icon sprites to color and text of Arguments if unused * Change Help and Info icon sprites to color and text of Arguments if unused
* Change sharper looking heart image on the Add Show page * Change sharper looking heart image on the Add Show page
* Change Add Show on Add Trending Show Page to use the full Add New Show flow * Change Add Show on Add Trending Show Page to use the full Add New Show flow
* Fix adding shows with titles that contain "&" on Add Trending Show page
### 0.3.0 (2014-11-12 14:30:00 UTC) ### 0.3.0 (2014-11-12 14:30:00 UTC)

View file

@ -1,6 +1,7 @@
#import sickbeard #import sickbeard
#import datetime #import datetime
#import re #import re
#import urllib
#from sickbeard.common import * #from sickbeard.common import *
#from sickbeard import sbdatetime #from sickbeard import sbdatetime
#from sickbeard.helpers import anon_url #from sickbeard.helpers import anon_url
@ -148,7 +149,8 @@
#if 'ExistsInLibrary' in $cur_show['tvdb_id']: #if 'ExistsInLibrary' in $cur_show['tvdb_id']:
<p style="line-height: 1.5; padding: 2px 5px 3px">In library</p> <p style="line-height: 1.5; padding: 2px 5px 3px">In library</p>
#else #else
<a href="$sbRoot/home/addTraktShow?indexer_id=${cur_show['tvdb_id']}&amp;showName=${cur_show['title']}" class="btn btn-xs">Add Show</a> #set $encoded_show_title = urllib.quote($cur_show['title'].encode("utf-8"))
<a href="$sbRoot/home/addTraktShow?indexer_id=${cur_show['tvdb_id']}&amp;showName=${encoded_show_title}" class="btn btn-xs">Add Show</a>
#end if #end if
</div> </div>
</div> </div>