Skip to content

Commit

Permalink
Merge pull request #267 from ukdtom/dev-2.4.1
Browse files Browse the repository at this point in the history
Dev 2.4.1
  • Loading branch information
ukdtom authored Feb 19, 2017
2 parents a91a2f1 + 7871e48 commit a8f3c4b
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 11 deletions.
17 changes: 11 additions & 6 deletions Contents/Code/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,17 @@ def removeEmptyFolders(path, removeRoot=True):

''' Returns commit time and Id for a git branch '''
def getAtom_UpdateTime_Id(self, url, branch):
# Build AtomUrl
atomUrl = url + '/commits/' + branch + '.atom'
# Get Atom
atom = HTML.ElementFromURL(atomUrl)
mostRecent = atom.xpath('//entry')[0].xpath('./updated')[0].text[:-6]
commitId = atom.xpath('//entry')[0].xpath('./id')[0].text.split('/')[-1][:10]
try:
# Build AtomUrl
atomUrl = url + '/commits/' + branch + '.atom'
# Get Atom
atom = HTML.ElementFromURL(atomUrl)
mostRecent = atom.xpath('//entry')[0].xpath('./updated')[0].text[:-6]
commitId = atom.xpath('//entry')[0].xpath('./id')[0].text.split('/')[-1][:10]
except Exception, e:
commitId = '0'
mostRecent = 'Not found'
pass
return {'commitId' : commitId, 'mostRecent' : mostRecent}

''' This function will return a list of bundles, where there is an update avail '''
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4
2.4.1
7 changes: 7 additions & 0 deletions http/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
V2.4.1:
Fix:
#264 UAS: v2.4 of WebTools UnsupportedAppStore Error
#265 SUB: No paging by letter, for TV-Shows

####

V2.4:
Fix:
#166 WT: Themes - v2.2 release - Default theme error
Expand Down
6 changes: 3 additions & 3 deletions http/modules/subtitlemgmt/jscript/functions_shows.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ subtitlemgmt.fetch_section_type_show = function(section_key, pageToShow) {
var start = (Number(subtitlemgmt.selected_section.currentpage) * Number(subtitlemgmt.options.items_per_page));
webtools.loading('Library Size: ' + subtitlemgmt.selected_section.totalsize + '<br>Currently fetching: ' + start + '->' + (start + subtitlemgmt.options.items_per_page));
$.ajax({
url: '/webtools2?module=pms&function=getSection&key=' + subtitlemgmt.selected_section.key + '&start=' + start + '&size=' + subtitlemgmt.options.items_per_page,
url: '/webtools2?module=pms&function=getSection&key=' + subtitlemgmt.selected_section.key + '&start=0&size=9999',
cache: false,
dataType: 'JSON',
success: function(data) {
Expand Down Expand Up @@ -199,7 +199,7 @@ subtitlemgmt.fetch_season_episodes = function(season_key, pageToShow) {
});
}
], function() {
subtitlemgmt.display_episodes();
subtitlemgmt.display_episodes(true);
});
get_episodes.start(season_key);
}
Expand Down Expand Up @@ -234,7 +234,7 @@ subtitlemgmt.display_season = function() {
if (end > subtitlemgmt.selected_section.contents.length) {
end = subtitlemgmt.selected_section.contents.length
}
for (var i = (subtitlemgmt.selected_section.currentpage * subtitlemgmt.options.items_per_page); i < end; i++) {
for (var i = 0; i < subtitlemgmt.selected_section.contents.length; i++) {
newEntry.push('<tr><td><a class="customlink" onclick="javascript:subtitlemgmt.fetch_season_episodes(' + subtitlemgmt.selected_section.contents[i].key + ',0)">' + subtitlemgmt.selected_section.contents[i].title + '</a></td><td>Episodes in season: ' + subtitlemgmt.selected_section.contents[i].size + '</td></tr>');

}
Expand Down
7 changes: 6 additions & 1 deletion http/modules/subtitlemgmt/jscript/functions_video.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ subtitlemgmt.fetch_section_type_movies = function(section_key, pageToShow) {
get_section_video.start(section_key);
}

subtitlemgmt.display_episodes = function () {
subtitlemgmt.display_episodes = function (forceAll) {
window.scrollTo(0, 0);
/*
Go through all the options and modify the output accordingly.
Expand Down Expand Up @@ -166,6 +166,11 @@ subtitlemgmt.display_episodes = function () {

$('#ContentBody').html('');


if (forceAll) {
start = 0
end = subtitlemgmt.selected_section.contents.length;
}
for (var i = start; i < end; i++) {
if (subtitlemgmt.options.options_hide_withoutsubs && subtitlemgmt.selected_section.contents[i].subtitles.length === 0) {
continue;
Expand Down

0 comments on commit a8f3c4b

Please sign in to comment.