MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Fixed bug on rendering extra space when no configurable providers exist.

This commit is contained in:
gkolokythas 2019-11-15 10:26:56 +02:00
parent 0a27835367
commit d5b6329510
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/ConfigurableProvider/models/ConfigurableProvidersModel.java
View File

@ -19,9 +19,11 @@ public class ConfigurableProvidersModel {
public ConfigurableProvidersModel fromDataModel(ConfigurableProviders entity) {
ConfigurableProvidersModel model = new ConfigurableProvidersModel();
List<ConfigurableProviderModel> providerModelList = new LinkedList<>();
for (ConfigurableProvider entityProvider : entity.getProviders()) {
if (entityProvider.getEnabled())
providerModelList.add(new ConfigurableProviderModel().fromDataModel(entityProvider));
if (entity != null) {
for (ConfigurableProvider entityProvider : entity.getProviders()) {
if (entityProvider.getEnabled())
providerModelList.add(new ConfigurableProviderModel().fromDataModel(entityProvider));
}
}
model.setProviders(providerModelList);
return model;

2
dmp-frontend/src/app/ui/auth/login/login.component.html
View File

@ -47,7 +47,7 @@
</div>
<!-- </div> -->
</div>
<div class="row pt-2 mb-4 accesss-methods">
<div *ngIf="hasConfigurableProviders()" class="row pt-2 mb-4 accesss-methods">
<div *ngFor="let provider of this.configurableProviderService.providers" class="col-auto configurable-logo">
<button mat-icon-button class="configurable-button" (click)="configurableLogin(provider)" class="login-social-button">
<span class="configurableIcon">{{provider.name}}</span>

4
dmp-frontend/src/app/ui/auth/login/login.component.ts
View File

@ -187,4 +187,8 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
}
}, { scope: 'user_friends,email' });
}
public hasConfigurableProviders(): boolean {
return !(this.configurableProviderService.providers == undefined) && this.configurableProviderService.providers.length > 0
}
}