Project

General

Profile

« Previous | Next » 

Revision 59626

[Monitor Dashboard | Trunk]: Remove general route.

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/manageStakeholders/manageStakeholders.component.html
36 36
         uk-grid>
37 37
      <loading *ngIf="loading"></loading>
38 38
      <ng-template ngFor [ngForOf]="defaultStakeholders" let-stakeholder let-i="index">
39
        <a *ngIf="stakeholder" [routerLink]="stakeholder.alias+'/indicators'+(stakeholder.topics.length > 0 ?
40
           '/' + stakeholder.topics[0].alias:'')">
39
        <a *ngIf="stakeholder" [routerLink]="stakeholder.alias">
41 40
          <div class="uk-card uk-card-default">
42 41
            <div class=" uk-padding-small uk-card-header">
43 42
              <div class="md-card-toolbar-actions uk-float-right" [class.uk-flex-middle]="!grid" [class.uk-flex]="!grid">
......
122 121
         uk-grid>
123 122
      <loading *ngIf="loading"></loading>
124 123
      <ng-template ngFor [ngForOf]="displayStakeholders" let-stakeholder let-i="index">
125
        <a *ngIf="stakeholder"
126
           [routerLink]="stakeholder.alias+'/indicators'+(stakeholder.topics.length > 0 ?
127
           '/' + stakeholder.topics[0].alias:'')">
124
        <a *ngIf="stakeholder" [routerLink]="stakeholder.alias">
128 125
          <div class="uk-card uk-card-default">
129 126
            <div class=" uk-padding-small uk-card-header">
130 127
              <div class="md-card-toolbar-actions uk-float-right" [class.uk-flex-middle]="!grid" [class.uk-flex]="!grid">
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.component.ts
230 230
          rootItem: new MenuItem("", "Dashboard",
231 231
            "", '/'+ this.stakeholder.alias+'/', false, [], null, {}), items: []
232 232
        });
233
        this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/"+this.stakeholder.alias + '/general', false, [], [], {}, "<i uk-icon=\"image\"></i>"));
233
        this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/"+this.stakeholder.alias, false, [], [], {}, "<i uk-icon=\"image\"></i>"));
234 234
        this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/"+this.stakeholder.alias + '/indicators', false, [], [], {}, "<i uk-icon=\"image\"></i>"));
235 235
        this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/"+this.stakeholder.alias+"/users", false, [], [], {}, "<i uk-icon=\"users\"></i>"));
236 236
        this.specialSideBarMenuItem  = new MenuItem("back", "Manage profiles", "", "/admin",false, [], null, {});
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/manageStakeholder/edit-stakeholder/edit-stakeholder.component.ts
74 74
             [placeholder]="'Select a type'" hint="Select the type of your profile"
75 75
             label="Type" [options]="stakeholderUtils.types" type="select">
76 76
        </div>
77
        <ng-container *ngIf="!stakeholderFb.get('isDefault').value && isNew && stakeholderFb.get('type').valid">
78
          <div *ngIf="defaultStakeholdersOptions.length === 0" class="uk-text-danger uk-width-1-3@m">No default profiles
79
            has been found
80
            for this type.
81
          </div>
82
          <div *ngIf="defaultStakeholdersOptions.length > 0" [placeholder]="'Select a template'"
77
        <ng-container *ngIf="!stakeholderFb.get('isDefault').value && isNew && stakeholderFb.get('type').valid && defaultStakeholdersOptions">
78
          <div [placeholder]="'Select a template'"
83 79
               hint="Select a template for your profile"
84 80
               dashboard-input class="uk-width-1-3@m" [formInput]="stakeholderFb.get('defaultId')"
85 81
               label="Template" [options]="defaultStakeholdersOptions" type="select"></div>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app-routing.module.ts
32 32
    data: {hasAdminMenu: true}
33 33
  },
34 34
  {
35

  
36
    path: 'admin/:stakeholder/general',
37
    loadChildren: './manageStakeholder/manageStakeholder.module#ManageStakeholderModule',
38
    resolve: {envSpecific: EnvironmentSpecificResolver},
39
    data: {hasAdminMenu: true}
40
  },
41
  {
42 35
    path: 'admin/:stakeholder/users',
43 36
    loadChildren: './users/users.module#UsersModule',
44 37
    resolve: {envSpecific: EnvironmentSpecificResolver},
45 38
    data: {hasAdminMenu: true}
46 39
  },
47 40
  {
48
     path: 'admin/:stakeholder',
49
    loadChildren: './stakeholder/stakeholder.module#StakeholderModule',
41
    path: 'admin/:stakeholder',
42
    loadChildren: './manageStakeholder/manageStakeholder.module#ManageStakeholderModule',
50 43
    resolve: {envSpecific: EnvironmentSpecificResolver},
44
    data: {hasAdminMenu: true}
51 45
  },
52 46
  {
53 47
    path: 'admin/:stakeholder/indicators/:topic',

Also available in: Unified diff