Project

General

Profile

« Previous | Next » 

Revision 60242

[Monitor Dashboard | Trunk]: Delete hasMiniMenu from app.component.ts and route data.

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.component.ts
27 27
  hasSidebar: boolean = false;
28 28
  hasHeader: boolean = false;
29 29
  hasAdminMenu: boolean = false;
30
  hasMiniMenu: boolean = false;
31 30
  isFrontPage: boolean = false;
32 31
  isDashboard: boolean = false;
33 32
  isViewPublic: boolean = false;
......
100 99
      this.hasAdminMenu = hasAdminMenu;
101 100
      this.cdr.detectChanges();
102 101
    }));
103
    this.subscriptions.push(this.layoutService.hasMiniMenu.subscribe(hasMiniMenu => {
104
      this.hasMiniMenu = hasMiniMenu;
105
      this.cdr.detectChanges();
106
    }));
107 102
    this.subscriptions.push(this.layoutService.isFrontPage.subscribe(isFrontPage => {
108 103
      this.isFrontPage = isFrontPage;
109 104
      this.cdr.detectChanges();
......
147 142
                this.buildMenu();
148 143
                this.loading = false;
149 144
              }
150
            }, error => {
151
              this.stakeholder = null;
152
              LinksResolver.resetProperties();
153
              this.resetProperties();
154
              if (error && error.status && error.status === 404) {
155
                this.navigateToError();
156
              }
157
              this.buildMenu();
158
              this.loading = false;
159 145
            }));
160 146
          } else {
161 147
            this.buildMenu();
......
184 170
      if (user) {
185 171
        this.buildMenu();
186 172
      }
187
    }, error => {
188
      console.log("App couldn't fetch properties");
189
      console.log(error);
190 173
    }));
191 174
  }
192 175
  
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app-routing.module.ts
64 64
    path: 'admin-tools',
65 65
    loadChildren: './admin-tool/admin-tool-routing.module#AdminToolRoutingModule',
66 66
    resolve: {envSpecific: EnvironmentSpecificResolver},
67
    data: {hasMiniMenu: true, isFrontPage: false}
68 67
  },
69

  
70 68
  { path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
71 69
  {
72 70
    path: '',
73 71
    loadChildren: './monitor/monitor.module#MonitorModule',
74 72
    resolve: {envSpecific: EnvironmentSpecificResolver},
75
    data: {hasMiniMenu: true, isFrontPage: true}
73
    data: {isFrontPage: true}
76 74
  },
77 75
  {
78 76
    path: '**',

Also available in: Unified diff