Merge branch 'develop' of https://github.com/h-da/geli into feature/#599

-Dedicated-File-Screen # Conflicts: # app/webFrontend/src/app/course/course-detail/course-detail.component.ts # app/webFrontend/src/app/course/course-detail/download-course-dialog/download-course-dialog.component.ts
geli-lms · May 15, 2018 · 71061ff · 71061ff
1 parent 31eef06
commit 71061ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/webFrontend/package-lock.json b/app/webFrontend/package-lock.json
diff --git a/app/webFrontend/src/app/course/course-detail/course-detail.component.ts b/app/webFrontend/src/app/course/course-detail/course-detail.component.ts
@@ -1,4 +1,4 @@
-import {AfterViewInit, Component, OnInit} from '@angular/core';
+import {AfterViewInit, Component, OnDestroy, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import 'rxjs/add/operator/switchMap';
 import {CourseService, UserDataService} from '../../shared/services/data.service';
@@ -9,14 +9,15 @@ import {MatSnackBar, MatDialog} from '@angular/material';
 import {TitleService} from '../../shared/services/title.service';
 import {LastVisitedCourseContainerUpdater} from '../../shared/utils/LastVisitedCourseContainerUpdater';
 import {DialogService} from '../../shared/services/dialog.service';
+import {DataSharingService} from '../../shared/services/data-sharing.service';
 
 
 @Component({
   selector: 'app-course-detail',
   templateUrl: './course-detail.component.html',
   styleUrls: ['./course-detail.component.scss']
 })
-export class CourseDetailComponent implements OnInit {
+export class CourseDetailComponent implements OnInit, OnDestroy {
 
   course: ICourse;
   id: string;
@@ -34,7 +35,8 @@ export class CourseDetailComponent implements OnInit {
               private dialog: MatDialog,
               private titleService: TitleService,
               private userDataService: UserDataService,
-              private dialogService: DialogService) {
+              private dialogService: DialogService,
+              private dataSharingService: DataSharingService) {
   }
 
   ngOnInit() {
@@ -50,4 +52,7 @@ export class CourseDetailComponent implements OnInit {
     this.dialogService.userProfile(teacher);
   }
 
+  ngOnDestroy() {
+    this.dataSharingService.deleteDataForKey('course');
+  }
 }
diff --git a/app/webFrontend/src/app/course/course-detail/course-overview/course-overview.component.ts b/app/webFrontend/src/app/course/course-detail/course-overview/course-overview.component.ts
@@ -13,8 +13,7 @@ import {DataSharingService} from '../../../shared/services/data-sharing.service'
 export class CourseOverviewComponent implements OnInit {
   course: ICourse;
 
-  constructor(private dataSharingService: DataSharingService,
-              private route: ActivatedRoute,) {
+  constructor(private dataSharingService: DataSharingService) {
   }
 
   ngOnInit() {