Skip to content

Commit 3a2422f

Browse files
committed
Merge pull request #125 from cloudspace/67550998_lists_shouldnt_filter_themselves
Lists exclude their own filters when displaying counts
2 parents 4f61fcd + 96296a1 commit 3a2422f

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

app/scripts/services/company.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -236,24 +236,5 @@ angular.module('crunchinatorApp.models').service('Company', function(Model, API_
236236
}
237237
};
238238

239-
Company.prototype.roundPassesFilters = function(round, fd){
240-
//Round's category is included in filters
241-
if(fd.categoryIds.length > 0 && !_.include(fd.categoryIds, round.company.category_id)) {
242-
return false;
243-
}
244-
245-
//Round's company includes filtered investor ids
246-
if(fd.investorIds.length > 0 && _.intersection(fd.investorIds, round.company.investor_ids).length < 1) {
247-
return false;
248-
}
249-
250-
//Round passes all other filters
251-
if(!Model.roundPassesFilters(round, fd)) {
252-
return false;
253-
}
254-
255-
return true;
256-
};
257-
258239
return new Company();
259240
});

app/styles/main.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ header{
394394
color: #fff;
395395
}
396396

397-
.textlist .selected {
397+
.textlist .dataset tr.selected {
398398
color: #67BEFD;
399399
}
400400

0 commit comments

Comments
 (0)