Skip to content

MOBILE-2358 frontpage: Removed duplicated forums #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2018
Merged

MOBILE-2358 frontpage: Removed duplicated forums #1237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion www/addons/frontpage/controllers/frontpage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ angular.module('mm.addons.frontpage')
* @name mmaFrontpageCtrl
*/
.controller('mmaFrontpageCtrl', function($mmCourse, $mmUtil, $scope, $stateParams, $mmSite, $q, $mmCoursePrefetchDelegate,
$mmCourseHelper) {
$mmCourseHelper, $mmAddonManager) {

// Default values are Site Home and all sections.
var courseId = $mmSite.getSiteHomeId(),
Expand All @@ -34,6 +34,7 @@ angular.module('mm.addons.frontpage')

// Convenience function to fetch section(s).
function loadContent() {
var hasNewsItem = false;
$scope.hasContent = false;

var config = $mmSite.getStoredConfig() || {numsections: 1};
Expand Down Expand Up @@ -61,6 +62,10 @@ angular.module('mm.addons.frontpage')
return;
}

if (item == 'mma-frontpage-item-news') {
hasNewsItem = true;
}

$scope.hasContent = true;
$scope.items.push(item);
});
Expand All @@ -87,6 +92,29 @@ angular.module('mm.addons.frontpage')

// Add log in Moodle.
$mmCourse.logView(courseId);

// Remove duplicated news forum.

// Remove forum activity (news one only). This should be fast since the same calls are done by the
// frontpageitemnews directive.
if (hasNewsItem && $scope.block && $scope.block.modules) {
$mmaModForum = $mmAddonManager.get('$mmaModForum');
if ($mmaModForum) {
return $mmaModForum.getCourseForums(courseId).then(function(forums) {
for (var x in forums) {
if (forums[x].type == 'news') {
angular.forEach($scope.block.modules, function(blockModule, key) {
if (blockModule.modname == 'forum' && blockModule.instance == forums[x].id) {
$scope.block.modules.splice(key, 1);
}
});
break;
}
}
});
}
}

}, function(error) {
$mmUtil.showErrorModalDefault(error, 'mm.course.couldnotloadsectioncontent', true);
});
Expand Down