diff --git a/legacy/Makefile b/legacy/Makefile index 189c9f371..868c09737 100644 --- a/legacy/Makefile +++ b/legacy/Makefile @@ -12,8 +12,16 @@ locale-update: locale-build: $(MAKE) -C locale clean build +export COMPOSER_ALLOW_SUPERUSER = true +COMPOSER_INSTALL = composer install \ + --no-interaction \ + --no-progress \ + --no-plugins \ + --no-scripts \ + --optimize-autoloader + vendor: - composer install --no-progress --no-interaction $(COMPOSER_ARGS) + $(COMPOSER_INSTALL) .PHONY: test test: vendor @@ -28,8 +36,8 @@ lint: tools $(TOOLS)/bin/php-cs-fixer fix --verbose --dry-run --diff .PHONY: build -build: - COMPOSER_ARGS="--no-dev --ignore-platform-reqs" $(MAKE) +build: locale-build + $(COMPOSER_INSTALL) --no-dev --ignore-platform-reqs propel-gen: vendor cd build && \ diff --git a/legacy/application/assets.json b/legacy/application/assets.json index f0f1e10f9..a24d86908 100644 --- a/legacy/application/assets.json +++ b/legacy/application/assets.json @@ -59,7 +59,7 @@ "js/airtime/dashboard/versiontooltip.js": "f267c6ec0205e98f1ffba5f636928f7a", "js/airtime/library/events/library_playlistbuilder.js": "1e0aa11953c7ff243cd2df241cc8a296", "js/airtime/library/events/library_showbuilder.js": "996a5c3008eb17552ee8f891d88c9341", - "js/airtime/library/library.js": "aded43b205f22a023cb85724c5945e45", + "js/airtime/library/library.js": "0306336f09adc3b825b540a7aaa0fab7", "js/airtime/library/plupload.js": "7f754a28ac2d4060aec918c688a74a22", "js/airtime/library/podcast.js": "f4fd354d739e7121ba00162496c295df", "js/airtime/library/publish.js": "851ef4c4caa9e9220acf945c21760189", diff --git a/legacy/public/js/airtime/library/library.js b/legacy/public/js/airtime/library/library.js index f104c7a17..5c76a2892 100644 --- a/legacy/public/js/airtime/library/library.js +++ b/legacy/public/js/airtime/library/library.js @@ -1107,6 +1107,18 @@ var AIRTIME = (function (AIRTIME) { }); }) .html(type_button); + } else { + // Not on dashboard (show builder) + if ( + aData.track_type_id == null || + aData.track_type_id == undefined || + aData.track_type_id == 0 + ) { + var track_type_code = ""; + } else { + var track_type_code = TRACKTYPES[aData.track_type_id].code; + } + $(nRow).find("td.library_track_type").html(track_type_code); } // add audio preview image/button