Merge branch '3.4.x' into 3.5.x

link-it · May 26, 2021 · 04b7ce1 · 04b7ce1
2 parents 41c504e + fe55bc0
commit 04b7ce1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/...og-view/dialog-views/tipi-pendenza-dominio-view/tipi-pendenza-dominio-view.component.html b/...og-view/dialog-views/tipi-pendenza-dominio-view/tipi-pendenza-dominio-view.component.html
@@ -7,7 +7,7 @@
                                     form-ctrl-name="tipoPendenza_ctrl" [searching]="_searching" [required]="true" [input-hint]="_mapRisultati"
                                     (async-keyup)="_asyncKeyUp($event)" (option-click)="_onOptionSelection($event)" [options]="tipiPendenza_items">
         <ng-template let-item>
-          <div class="d-block lh-15">{{item.model.titolo.label}}</div>
+          <div class="d-block lh-15 slim-option">{{item.model.titolo.label}}</div>
         </ng-template>
       </link-async-filterable-select>
       <mat-form-field class="w-100" color="accent" [formGroup]="fGroup">

diff --git a/...n/angular/console/src/app/elements/detail-view/views/domini-view/domini-view.component.ts b/...n/angular/console/src/app/elements/detail-view/views/domini-view/domini-view.component.ts
@@ -643,6 +643,7 @@ export class DominiViewComponent implements IModalDialog, OnInit, AfterViewInit
           if(!mb.editMode) {
             this._paginatorOptions.pendenze.search = p.jsonP.descrizione;
             this._paginatorOptions.pendenze.refresh = true;
+            this.associazioniDisponibili();
           } else {
             this.tipiPendenza.map((item) => {
               if (item.jsonP.idTipoPendenza == mb.info.viewModel['idTipoPendenza']) {

diff --git a/wars/web-console/src/main/angular/console/src/styles/styles.scss b/wars/web-console/src/main/angular/console/src/styles/styles.scss
@@ -181,6 +181,10 @@ link-incassi-view .pagamenti-riconciliati link-key-value-view .row {
   font-size: 14px;
 }
 
+.async-opt .slim-option {
+  margin: -1rem 0;
+}
+
 
 // Overridden styles
 // mat-dialog, mat-card