From c5440811dd544f9fbee161365c9446bb3d85720f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 4 Jan 2019 15:29:27 +0100
Subject: [PATCH] MOBILE-2795 course: Fix disable download course

---
 .../course-progress/core-courses-course-progress.html        | 2 +-
 src/core/courses/pages/dashboard/dashboard.html              | 2 +-
 src/core/courses/pages/dashboard/dashboard.ts                | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html
index 413d94520..4e2757ebb 100644
--- a/src/core/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/courses/components/course-progress/core-courses-course-progress.html
@@ -22,7 +22,7 @@
 
         <div class="core-button-spinner" *ngIf="courseOptionMenuEnabled">
             <!-- Download course spinner. -->
-            <ion-spinner *ngIf="prefetchCourseData.prefetchCourseIcon == 'spinner' || showSpinner"></ion-spinner>
+            <ion-spinner *ngIf="(downloadCourseEnabled && prefetchCourseData.prefetchCourseIcon == 'spinner') || showSpinner"></ion-spinner>
 
             <!-- Options menu. -->
             <button ion-button icon-only clear color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner">
diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html
index 2178209a4..d648f0cbe 100644
--- a/src/core/courses/pages/dashboard/dashboard.html
+++ b/src/core/courses/pages/dashboard/dashboard.html
@@ -7,7 +7,7 @@
                 <ion-icon name="search"></ion-icon>
             </button>
             <core-context-menu>
-                <core-context-menu-item *ngIf="downloadCourseEnabled" [priority]="1000" [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()" [iconAction]="downloadEnabledIcon"></core-context-menu-item>
+                <core-context-menu-item *ngIf="downloadCourseEnabled || downloadCoursesEnabled" [priority]="1000" [content]="'core.settings.showdownloadoptions' | translate" (action)="toggleDownload()" [iconAction]="downloadEnabledIcon"></core-context-menu-item>
             </core-context-menu>
         </ion-buttons>
     </ion-navbar>
diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts
index 150ad911a..fccd91e7b 100644
--- a/src/core/courses/pages/dashboard/dashboard.ts
+++ b/src/core/courses/pages/dashboard/dashboard.ts
@@ -52,6 +52,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     downloadEnabled: boolean;
     downloadEnabledIcon = 'square-outline'; // Disabled by default.
     downloadCourseEnabled: boolean;
+    downloadCoursesEnabled: boolean;
 
     protected isDestroyed;
     protected updateSiteObserver;
@@ -69,11 +70,13 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     ionViewDidLoad(): void {
         this.searchEnabled = !this.coursesProvider.isSearchCoursesDisabledInSite();
         this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite();
+        this.downloadCoursesEnabled = !this.coursesProvider.isDownloadCoursesDisabledInSite();
 
         // Refresh the enabled flags if site is updated.
         this.updateSiteObserver = this.eventsProvider.on(CoreEventsProvider.SITE_UPDATED, () => {
             this.searchEnabled = !this.coursesProvider.isSearchCoursesDisabledInSite();
             this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite();
+            this.downloadCoursesEnabled = !this.coursesProvider.isDownloadCoursesDisabledInSite();
 
             this.switchDownload(this.downloadEnabled);
 
@@ -196,7 +199,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
      * @param {boolean} enable If enable or disable.
      */
     protected switchDownload(enable: boolean): void {
-        this.downloadEnabled = this.downloadCourseEnabled && enable;
+        this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable;
         this.downloadEnabledIcon = this.downloadEnabled ? 'checkbox-outline' : 'square-outline';
         this.eventsProvider.trigger(CoreCoursesProvider.EVENT_DASHBOARD_DOWNLOAD_ENABLED_CHANGED, {enabled: this.downloadEnabled});
     }