Project

General

Profile

« Previous | Next » 

Revision 60224

[Library | Trunk]
Search:
-fix: remove selected type filter did nothing
-fix: weird margin for selected filters

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/newSearchPage.component.html
3 3
    <ng-container *ngIf="customFilter && ((customFilterEnabled &&
4 4
    refineFields.indexOf(customFilter.queryFieldName) ==
5 5
    -1) ||customFilter.isHiddenFilter)">
6
     <span class="uk-grid-margin">
6
     <span class=" uk-margin-small-bottom">
7 7
        <span class="selectedFilterLabel customFilterLabel">
8 8
            <span class="">{{customFilter.valueName}}</span>
9 9
        </span>
......
13 13
      <ng-container *ngFor="let type of resultTypes.values; let i = index;  let end = last; ">
14 14
        <ng-container *ngIf="type.selected">
15 15
         <span [title]="'Remove '+ type.name" (click)="removeResultType(type.id) "
16
               [class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') + ' uk-grid-margin'">
16
               [class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') +
17
               '  uk-margin-small-bottom'">
17 18
            <span class="selectedFilterLabel ">
18 19
              <a class="uk-link-text">
19 20
                <span aria-hidden="true">
......
34 35
      <ng-container *ngFor="let filter of rangeFilters ">
35 36
        <ng-container *ngIf="filter.selectedFromAndToValues">
36 37
                        <span [title]="'Remove '+ filter.selectedFromAndToValues" (click)="removeRangeFilter(filter) "
37
                              [class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') + ' uk-grid-margin'">
38
                              [class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') +
39
                              '  uk-margin-small-bottom'">
38 40
                          <span class="selectedFilterLabel ">
39 41
                            <a class="uk-link-text">
40 42
                              <span aria-hidden="true">
......
60 62
              <span *ngIf="!customFilter || (customFilter.isHiddenFilter && customFilter.valueId != value.id)"
61 63
                    [title]="'Remove '+value.name"
62 64
                    (click)="removeFilter(value, filter) "
63
              [class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') + ' uk-grid-margin'">
65
              [class]="((disableForms || disableRefineForms) ? 'uk-disabled' : 'clickable') + '  uk-margin-bottom'">
64 66
                        <!-- if no grid on the div above, remove it and move class 'selectedFilterLabel' on top span -->
65 67
                        <span class="selectedFilterLabel ">
66 68
                          <a class="uk-link-text">
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/newSearchPage.component.ts
1573 1573
  }
1574 1574

  
1575 1575
  removeResultType(type){
1576
    if(this.resultTypes && this.resultTypes[type]){
1577
      this.resultTypes[type]=false;
1578
      this.goTo(1);
1576
    for(let value of this.resultTypes.values){
1577
      if(type == value.id && value.selected){
1578
        value.selected = false;
1579
        this.goTo(1);
1580
        break;
1581
      }
1579 1582
    }
1580 1583
  }
1581 1584
}

Also available in: Unified diff