Skip to content

Commit 4008647

Browse files
authored
Merge pull request #243 from BuildFire/fix-search-engine
Fix search engine
2 parents 7a73f41 + 17a4c88 commit 4008647

File tree

2 files changed

+33
-38
lines changed

2 files changed

+33
-38
lines changed

control/content/controllers/content.media.controller.js

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -628,59 +628,53 @@
628628
ContentMedia.item.data.bodyHTML = ContentMedia.item.data.body;
629629
ContentMedia.item.data && ContentMedia.item.data.title ?
630630
ContentMedia.item.data.titleIndex = ContentMedia.item.data.title.toLowerCase() : '';
631-
SearchEngineService.insert(ContentMedia.item.data).then(function (searchEngineData) {
632-
ContentMedia.item.data.searchEngineId = searchEngineData.id;
633-
MediaContent.insert(ContentMedia.item.data).then((data) => {
634-
createNewDeeplink(data, (err, deeplink) => {
631+
632+
MediaContent.insert(ContentMedia.item.data).then((item) => {
633+
item.data.deepLinkUrl = Buildfire.deeplink.createLink({ id: item.id });
634+
SearchEngineService.insert(item.data).then(function (searchEngineData) {
635+
item.data.searchEngineId = searchEngineData.id;
636+
MediaContent.update(item.id, item.data);
637+
createNewDeeplink(item, (err, deeplink) => {
635638
if (err) {
636639
callback(err);
637640
}
638641
if (MediaCenterSettings.content.allowOfflineDownload) {
639642
Analytics.registerEvent(
640643
{
641-
title: ContentMedia.item.data.title + " Video Downloads",
644+
title: item.data.title + " Video Downloads",
642645
key: data.id + "_downloads",
643646
description: "Video Downloads",
644647
},
645648
{ silentNotification: true }
646649
);
647650
}
648651

649-
650-
651-
652-
653-
MediaContent.getById(data.id).then((item) => {
654-
registerAnalytics(item);
655-
item.data.topImage = getImageUrl(item.data.topImage);
656-
item.data.image = getImageUrl(item.data.image);
657-
ContentMedia.item = item;
658-
ContentMedia.item.data.deepLinkUrl = Buildfire.deeplink.createLink({ id: item.id });
659-
updateMasterItem(item);
660-
ContentMedia.saving = false;
661-
if (!$scope.$$phase && !$scope.$root.$$phase) $scope.$apply();
662-
MediaCenterSettings.content.rankOfLastItem = item.data.rank;
663-
if (appId && MediaCenterSettings) {
664-
MediaCenter.update(appId, MediaCenterSettings).then((data) => {
665-
}, (err) => {
666-
callback(err);
667-
});
668-
} else {
669-
MediaCenter.insert(MediaCenterSettings).then((data) => {
670-
console.info("Inserted MediaCenter rank");
671-
}, (err) => {
672-
callback(err);
673-
});
674-
}
675-
Messaging.sendMessageToWidget({
676-
name: EVENTS.ITEMS_CHANGE,
677-
message: {}
652+
registerAnalytics(item);
653+
item.data.topImage = getImageUrl(item.data.topImage);
654+
item.data.image = getImageUrl(item.data.image);
655+
ContentMedia.item = item;
656+
updateMasterItem(item);
657+
ContentMedia.saving = false;
658+
if (!$scope.$$phase && !$scope.$root.$$phase) $scope.$apply();
659+
MediaCenterSettings.content.rankOfLastItem = item.data.rank;
660+
if (appId && MediaCenterSettings) {
661+
MediaCenter.update(appId, MediaCenterSettings).then((data) => {
662+
}, (err) => {
663+
callback(err);
678664
});
679-
680-
callback()
681-
}, (err) => {
682-
resetItem(err);
665+
} else {
666+
MediaCenter.insert(MediaCenterSettings).then((data) => {
667+
console.info("Inserted MediaCenter rank");
668+
}, (err) => {
669+
callback(err);
670+
});
671+
}
672+
Messaging.sendMessageToWidget({
673+
name: EVENTS.ITEMS_CHANGE,
674+
message: {}
683675
});
676+
677+
callback()
684678
}, (err) => {
685679
callback(err);
686680
});

widget/filters.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.module('mediaCenterWidgetFilters', [])
66
.filter('resizeImage', [function () {
77
return function (url, width, height) {
8+
if(!url) return '';
89
if (url.includes('cloudimg.io/v7')) {
910
return url;
1011
} else {

0 commit comments

Comments
 (0)