Skip to content

Conversation

@genu
Copy link
Contributor

@genu genu commented Apr 9, 2015

I also introduced the priority for the processor.

Followed the same style as registerRowsProcessor(...) method

Related to #3251

@PaulL1
Copy link
Contributor

PaulL1 commented Apr 9, 2015

Seems to have failed a number of unit tests.....

The comments probably need to be updated to reflect columnsProcessor, not rowsProcessor, and you'd need to go to each columnsProcessor that is registered in the code and set a priority on it.

@genu
Copy link
Contributor Author

genu commented Apr 9, 2015

sorry, I took a shot in the dark there. I cant seem to run the tests locally for some reason.

I get this when I run grunt dev --core

screen shot 2015-04-09 at 7 54 19 pm

I'll looking to fix this.

@PaulL1
Copy link
Contributor

PaulL1 commented Apr 10, 2015

Probably that's the e2e tests. You can run with:
grunt dev --no-e2e --angular=1.3.0

which works in most instances.

@genu
Copy link
Contributor Author

genu commented Apr 10, 2015

There seems to be an issue, I think with #3211. 3 Specs keep failing after that build.

@PaulL1
Copy link
Contributor

PaulL1 commented Apr 10, 2015

OK, that PR was passing all the tests when I merged it. I can take a look though.

I see it. I changed the processor to only return visible rows, but that probably happened after this PR was submitted.

The tests all changed to checking that only 1 row was returned, instead of one row being visible and one not visible. So those tests just need to be changed to be the same as the others - check the count of returned rows equals 1. Is that something you want to do to to complete this PR? You'll also need to squash the commits whilst you're at it.

@PaulL1
Copy link
Contributor

PaulL1 commented Apr 10, 2015

I've fixed those tests in master - you can potentially merge master down again, and then squash the commits and we're good to merge.

I also introduced the priority for the processor. Followed the same style as `registerRowsProcessor(...)` method Get the processor from the right location Add priority for when calling registerColumnProcessor Update tests to reflect updated search() return Add registerColumnsProcessor to API commit 3f30d94 Merge: 5034a86 69f421b Author: Paul <PaulL1@users.noreply.github.com> Date: Sat Apr 11 07:08:39 2015 +1200 Merge pull request angular-ui#3132 from pedroclayman/select-filter added filter attribute 'disableCancelFilterButton' commit 69f421b Merge: c495485 5034a86 Author: Peter Mihalik <peter.mihalik@gmail.com> Date: Fri Apr 10 14:51:08 2015 +0200 Merge branch 'upstream_master' into select-filter Conflicts:	src/templates/ui-grid/uiGridHeaderCell.html commit c495485 Author: Peter Mihalik <peter.mihalik@gmail.com> Date: Fri Mar 27 12:56:08 2015 +0100 added filter attribute 'disableCancelFilterButton' and select filter default empty option Get the processor from the right location Add priority for when calling registerColumnProcessor Update tests to reflect updated search() return Add registerColumnsProcessor to API commit 3f30d94 Merge: 5034a86 69f421b Author: Paul <PaulL1@users.noreply.github.com> Date: Sat Apr 11 07:08:39 2015 +1200 Merge pull request angular-ui#3132 from pedroclayman/select-filter added filter attribute 'disableCancelFilterButton' commit 69f421b Merge: c495485 5034a86 Author: Peter Mihalik <peter.mihalik@gmail.com> Date: Fri Apr 10 14:51:08 2015 +0200 Merge branch 'upstream_master' into select-filter Conflicts:	src/templates/ui-grid/uiGridHeaderCell.html commit c495485 Author: Peter Mihalik <peter.mihalik@gmail.com> Date: Fri Mar 27 12:56:08 2015 +0100 added filter attribute 'disableCancelFilterButton' and select filter default empty option Get the processor from the right location Add priority for when calling registerColumnProcessor Update tests to reflect updated search() return Add registerColumnsProcessor to API commit 3f30d94 Merge: 5034a86 69f421b Author: Paul <PaulL1@users.noreply.github.com> Date: Sat Apr 11 07:08:39 2015 +1200 Merge pull request angular-ui#3132 from pedroclayman/select-filter added filter attribute 'disableCancelFilterButton' commit 69f421b Merge: c495485 5034a86 Author: Peter Mihalik <peter.mihalik@gmail.com> Date: Fri Apr 10 14:51:08 2015 +0200 Merge branch 'upstream_master' into select-filter Conflicts:	src/templates/ui-grid/uiGridHeaderCell.html commit c495485 Author: Peter Mihalik <peter.mihalik@gmail.com> Date: Fri Mar 27 12:56:08 2015 +0100 added filter attribute 'disableCancelFilterButton' and select filter default empty option
@genu genu force-pushed the registerColumnsProcessor branch from cce8a26 to 798a2a8 Compare April 10, 2015 20:28
@PaulL1 PaulL1 merged commit 798a2a8 into angular-ui:master Apr 11, 2015
@genu genu deleted the registerColumnsProcessor branch April 11, 2015 04:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants