Skip to content
Snippets Groups Projects
Commit 9e3695ec authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge branch... 

Merge branch '220-enhance-configuration-model-and-display-two-additional-fields-on-the-settings-view' into 'develop'

Resolve "Enhance configuration model and display two additional fields on the settings view"

See merge request !27
parents 37623b4b 2ee97d21
No related branches found
No related tags found
1 merge request!27Resolve "Enhance configuration model and display two additional fields on the settings view"
Hide whitespace changes
Inline Side-by-side
src/app/appmarket/admin/configuration/details/configurationdetails.component.html
+ 44
− 23
View file @ 9e3695ec
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<form (submit)="save()" class="form-horizontal" #configurationForm="ngForm" *ngIf="this.configuration"> <form (submit)="save()" class="form-horizontal" #configurationForm="ngForm" *ngIf="this.configuration">
<div class="form-group"> <div class="form-group">
<label for="setMaintenance" <label for="setMaintenance"
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.MAINTENANCE' | translate }}</label> class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.MAINTENANCE' | translate }}</label>
<div class="col-sm-10 pd-top-7"> <div class="col-sm-9 pd-top-7">
<input type="checkbox" id="setMaintenance" name="setMaintenance" <input type="checkbox" id="setMaintenance" name="setMaintenance"
[(ngModel)]="this.configuration.maintenance" [(ngModel)]="this.configuration.maintenance"
[checked]="this.configuration.maintenance === true"> [checked]="this.configuration.maintenance === true">
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="SSOLoginAllowed" <label for="SSOLoginAllowed"
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.ALLOW_SSO_LOGIN' | translate }}</label> class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.ALLOW_SSO_LOGIN' | translate }}</label>
<div class="col-sm-10 pd-top-7"> <div class="col-sm-9 pd-top-7">
<input type="checkbox" id="SSOLoginAllowed" name="SSOLoginAllowed" <input type="checkbox" id="SSOLoginAllowed" name="SSOLoginAllowed"
[(ngModel)]="this.configuration.ssoLoginAllowed" [(ngModel)]="this.configuration.ssoLoginAllowed"
[checked]="this.configuration.ssoLoginAllowed === true"> [checked]="this.configuration.ssoLoginAllowed === true">
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="defaultLang" <label for="defaultLang"
class="col-sm-2 control-label">{{'PORTAL_CONFIGURATION.DEFAULT_LANGUAGE' | translate}}</label> class="col-sm-3 control-label">{{'PORTAL_CONFIGURATION.DEFAULT_LANGUAGE' | translate}}</label>
<div class="col-sm-3"> <div class="col-sm-3">
<select id="defaultLang" #langSelect class="form-control" <select id="defaultLang" #langSelect class="form-control"
(change)="this.configuration.defaultLanguage = langSelect.value"> (change)="this.configuration.defaultLanguage = langSelect.value">
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="testInstance" <label for="testInstance"
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.TEST_INSTANCE' | translate }}</label> class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.TEST_INSTANCE' | translate }}</label>
<div class="col-sm-10 pd-top-7"> <div class="col-sm-9 pd-top-7">
<input type="checkbox" id="testInstance" name="testInstance" <input type="checkbox" id="testInstance" name="testInstance"
[(ngModel)]="this.configuration.testInstance" [(ngModel)]="this.configuration.testInstance"
[checked]="this.configuration.testInstance === true"> [checked]="this.configuration.testInstance === true">
...@@ -43,29 +43,22 @@ ...@@ -43,29 +43,22 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="sendAppInstanceFailureEmails" <label for="sendAppInstanceFailureEmails"
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS' | translate }}</label> class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS' | translate }}</label>
<div class="col-sm-10 pd-top-7"> <div class="col-sm-9 pd-top-7">
<input type="checkbox" id="sendAppInstanceFailureEmails" name="sendAppInstanceFailureEmails" <input type="checkbox" id="sendAppInstanceFailureEmails" name="sendAppInstanceFailureEmails"
[(ngModel)]="this.configuration.sendAppInstanceFailureEmails"> [(ngModel)]="this.configuration.sendAppInstanceFailureEmails">
</div> </div>
</div> </div>
<div class="form-group">
<label for="registrationDomainSelectionEnabled"
class="col-sm-2 control-label">{{ 'PORTAL_CONFIGURATION.DOMAIN_SELECTION_ENABLED' | translate }}</label>
<div class="col-sm-10 pd-top-7">
<input type="checkbox" id="registrationDomainSelectionEnabled" name="registrationDomainSelectionEnabled"
[(ngModel)]="this.configuration.registrationDomainSelectionEnabled">
</div>
</div>
<div class="form-group"> <div class="form-group">
<span class="control-label col-sm-2"> <span class="control-label col-sm-3">
<strong> <strong>
{{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS_LIST' | translate }} {{ 'PORTAL_CONFIGURATION.SEND_APP_INSTANCE_FAILURE_EMAILS_LIST' | translate }}
</strong> </strong>
</span> </span>
<div class="col-sm-10 display-emails"> <div class="col-sm-9 display-emails">
<div *ngFor="let email of configuration.appInstanceFailureEmailList; let i=index; trackBy:trackByFn" <div *ngFor="let email of configuration.appInstanceFailureEmailList; let i=index; trackBy:trackByFn"
class="col-lg-6 col-md-10 col-sm-12 pd-bottom-5 row email-row"> class="col-lg-6 col-md-10 col-sm-12 pd-bottom-5 row email-row">
<div class="email-input"> <div class="email-input">
...@@ -84,9 +77,37 @@ ...@@ -84,9 +77,37 @@
</button> </button>
</div> </div>
</div> </div>
</div>
<div class="form-group">
<label for="registrationDomainSelectionEnabled"
class="col-sm-3 control-label">{{ 'PORTAL_CONFIGURATION.DOMAIN_SELECTION_ENABLED' | translate }}</label>
<div class="col-sm-9 pd-top-7">
<input type="checkbox" id="registrationDomainSelectionEnabled" name="registrationDomainSelectionEnabled"
[(ngModel)]="this.configuration.registrationDomainSelectionEnabled">
</div>
</div>
<div class="form-group">
<label for="bulkDomainsAllowForSsoAccounts"
class="col-sm-3 control-label">{{'PORTAL_CONFIGURATION.BULK_DOMAINS_ALLOW_FOR_SSO_ACCOUNTS' | translate}}</label>
<div class="col-sm-9 pd-top-7">
<input type="checkbox" id="bulkDomainsAllowForSsoAccounts" name="bulkDomainsAllowForSsoAccounts"
[(ngModel)]="this.configuration.bulkDomainsAllowForSsoAccounts"
[checked]="this.configuration.bulkDomainsAllowForSsoAccounts === true">
</div>
</div>
<div class="form-group">
<label for="bulkDomainsSendEmailForNewAccounts"
class="col-sm-3 control-label">{{'PORTAL_CONFIGURATION.BULK_DOMAINS_SEND_EMAIL_FOR_NEW_ACCOUNTS' | translate}}</label>
<div class="col-sm-9 pd-top-7">
<input type="checkbox" id="bulkDomainsSendEmailForNewAccounts" name="bulkDomainsSendEmailForNewAccounts"
[(ngModel)]="this.configuration.bulkDomainsSendEmailForNewAccounts"
[checked]="this.configuration.bulkDomainsSendEmailForNewAccounts === true">
</div>
</div> </div>
<button class="btn btn-primary" <button class="btn btn-primary"
type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button> type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button>
<div class="alert alert-danger" style="margin-top: 5px" *ngIf="errorMsg"> <div class="alert alert-danger" style="margin-top: 5px" *ngIf="errorMsg">
......
src/app/model/configuration.ts
+ 2
− 0
View file @ 9e3695ec
...@@ -6,5 +6,7 @@ export class Configuration { ...@@ -6,5 +6,7 @@ export class Configuration {
public testInstance: boolean; public testInstance: boolean;
public sendAppInstanceFailureEmails: boolean; public sendAppInstanceFailureEmails: boolean;
public registrationDomainSelectionEnabled: boolean; public registrationDomainSelectionEnabled: boolean;
public bulkDomainsAllowForSsoAccounts: boolean;
public bulkDomainsSendEmailForNewAccounts: boolean;
public appInstanceFailureEmailList: string[] = []; public appInstanceFailureEmailList: string[] = [];
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment