Project

General

Profile

« Previous | Next » 

Revision 59773

[Monitor|Trunk]

- update user menu items
- remove unused page helptexts calls
-update properties

View differences:

modules/uoa-monitor-portal/trunk/monitor/src/app/app.component.ts
122 122
  
123 123
  public setUserMenu() {
124 124
    this.userMenuItems = [];
125
    if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isCommunityCurator(this.user)) {
126
      /*this.userMenuItems.push(new MenuItem("", "Manage Helptexts",
127
        ((this.properties.environment == "production") ? "https://admin.explore.openaire.eu" : "https://beta.admin.connect.openaire.eu") + "/dashboard?communityId=connect",
128
        "", false, [], [], {}))*/
129
      this.userMenuItems.push(new MenuItem("", "Manage Stakeholders",
130
        this.properties.domain + properties.baseLink + "/dashboard/admin", "", true, [], [], {}))
125
    if (this.user) {
126
      if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isKindOfMonitorManager(this.user)) {
127
        this.userMenuItems.push(new MenuItem("", "Manage profiles",
128
          this.properties.domain + properties.baseLink + "/dashboard/admin", "", false, [], [], {}))
129
      }
130
      this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
131 131
    }
132 132
  }
133 133
}
modules/uoa-monitor-portal/trunk/monitor/src/app/home/home.component.ts
127 127
        this.getStakeholders();
128 128
        // this.createGifs();
129 129
        //this.getDivContents();
130
        this.getPageContents();
130
        // this.getPageContents();
131 131
        this.localStorageService.get().subscribe(value => {
132 132
          this.directLink = value;
133 133
        });
modules/uoa-monitor-portal/trunk/monitor/src/app/contact/contact.component.ts
62 62
            this.updateDescription("OpenAIRE - Monitor, Community Gateway, research community - Contact Us");
63 63
            this.reset();
64 64
            //this.getDivContents();
65
            this.getPageContents();
65
            // this.getPageContents();
66 66
            HelperFunctions.scroll();
67 67
            this.showLoading = false;
68 68
        });
modules/uoa-monitor-portal/trunk/monitor/src/environments/environment.ts
45 45
  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
46 46
  piwikSiteId: "80",
47 47
  registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
48
  loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login",
49
  userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
50
  logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
51
  /*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
48
  loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
52 49
  userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
53
  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/
50
  /*logoutUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_logout",*/
51
  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
54 52
  cookieDomain: ".di.uoa.gr",
55 53
  feedbackmail: "openaire.test@gmail.com",
56 54
  cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
modules/uoa-monitor-portal/trunk/monitor/src/environments/environment.prod.ts
40 40
  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
41 41
  piwikSiteId: "104",
42 42
  loginUrl: "https://services.openaire.eu/monitor-login/openid_connect_login",
43
  userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
43 44
  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
44 45
  cookieDomain: ".openaire.eu",
45 46
  feedbackmail: "feedback@openaire.eu",

Also available in: Unified diff