Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Fix track number bug in analyzer

Browse source 
* Move library search bar out of header
This commit is contained in:
Duncan Sommerville 2015-09-16 17:50:21 -04:00
parent dc840bf25f
commit a78a0d0cc8
3 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -255,7 +255,10 @@ var AIRTIME = (function(AIRTIME) {
var $toolbar = $(".lib-content .fg-toolbar:first"); var $toolbar = $(".lib-content .fg-toolbar:first");
mod.createToolbarButtons(); mod.createToolbarButtons();
mod.moveSearchBarToHeader(); //mod.moveSearchBarToHeader();
$("#advanced_search").click(function(e) {
e.stopPropagation();
});
if (localStorage.getItem('user-type') != 'G') { if (localStorage.getItem('user-type') != 'G') {
$toolbar.append($menu); $toolbar.append($menu);

21
airtime_mvc/public/js/airtime/library/library.js
View file

@ -214,13 +214,6 @@ var AIRTIME = (function(AIRTIME) {
); );
}; };
mod.moveSearchBarToHeader = function() {
$("#library_display_filter").appendTo("#library_content > .panel-header");
$("#advanced_search").click(function(e) {
e.stopPropagation();
});
};
mod.createToolbarDropDown = function() { mod.createToolbarDropDown = function() {
$('#sb-select-page').click(function(){mod.selectCurrentPage();}); $('#sb-select-page').click(function(){mod.selectCurrentPage();});
$('#sb-dselect-page').click(function(){mod.deselectCurrentPage();}); $('#sb-dselect-page').click(function(){mod.deselectCurrentPage();});
@ -491,18 +484,6 @@ var AIRTIME = (function(AIRTIME) {
} }
AIRTIME.library.fnDeleteItems(aMedia); AIRTIME.library.fnDeleteItems(aMedia);
// close the object (playlist/block/webstream)
// on the right side if it was just deleted
// from the library
//if (closeObj) {
// $.post(baseUrl+"playlist/close-playlist",
// {"format": "json", "type": currentObjType},
// function(json) {
// $("#editor_pane_wrapper").empty().append(json.html);
// });
//}
} }
}; };
@ -731,7 +712,7 @@ var AIRTIME = (function(AIRTIME) {
"oColVis": { "oColVis": {
"sAlign": "right", "sAlign": "right",
"aiExclude": [0, 1, 2, 31], "aiExclude": [0, 1, 2, 32],
"sSize": "css", "sSize": "css",
"fnStateChange": setFilterElement, "fnStateChange": setFilterElement,
"buttonText": $.i18n._("Columns"), "buttonText": $.i18n._("Columns"),

1
python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
View file

@ -100,6 +100,7 @@ class MetadataAnalyzer(Analyzer):
track_number_tokens = track_number track_number_tokens = track_number
if u'/' in track_number: if u'/' in track_number:
track_number_tokens = track_number.split(u'/') track_number_tokens = track_number.split(u'/')
track_number = track_number_tokens[0]
elif u'-' in track_number: elif u'-' in track_number:
track_number_tokens = track_number.split(u'-') track_number_tokens = track_number.split(u'-')
track_number = track_number_tokens[0] track_number = track_number_tokens[0]