Project

General

Profile

« Previous | Next » 

Revision 60992

[Trunk | Library]:
1. newSearchPage.component.html: In search pages show warning message when there is an error (e.g. timeout) getting refine filters.
(do not hide message for not available filters when existingFiltersWithValues > 0 - when there are filters created by url)
2. searchResearchResults.component.ts & searchProjects.component.ts & searchOrganizations.component.ts & searchDataProviders.component.ts:
a. Set refine to true when there was an error in the previous refine query (searchPage.searchUtils.refineStatus != this.errorCodes.DONE).
b. When there is an error getting refine filters, call searchPage.prepareFiltersToShow([], 0) (and prepareRangeFiltersToShow() for results and projects).

View differences:

searchProjects.component.ts
113 113
        this.oldTotalResults = this.searchUtils.totalResults;
114 114
      }
115 115
      var refine = true;
116
      if (params['page'] != undefined && this.filters && !firstLoad && this.searchUtils.page != +params['page']) {
117
        refine = false;
118
      }
116
      if(this.searchPage.searchUtils.refineStatus == this.errorCodes.DONE) {
117
        if (params['page'] != undefined && this.filters && !firstLoad && this.searchUtils.page != +params['page']) {
118
          refine = false;
119
        }
119 120

  
120
      if (params['size'] != undefined && this.filters && !firstLoad && this.searchUtils.size != params['size']) {
121
        refine = false;
121
        if (params['size'] != undefined && this.filters && !firstLoad && this.searchUtils.size != params['size']) {
122
          refine = false;
123
        }
122 124
      }
123

  
124 125
      let page = (params['page']=== undefined)?1:+params['page'];
125 126
      this.searchUtils.page = ( page <= 0 ) ? 1 : page;
126 127

  
......
168 169

  
169 170
          },
170 171
          err => {
171
            this.handleError("Error getting projects: ", err);
172
            this.filters = this.searchPage.prepareFiltersToShow([], 0);
173
            this.rangeFilters = this.searchPage.prepareRangeFiltersToShow();
174

  
175
            this.handleError("Error getting refine filters for projects: ", err);
172 176
            this.searchUtils.refineStatus = this.errorMessages.getErrorCode(err.status);
173 177

  
174 178
            this.disableRefineForms = false;

Also available in: Unified diff