Don't show edit request button if config.hideNewRequestButton is true #1024

Merged
merged 3 commits into from May 6, 2016

Conversation

Projects
None yet
2 participants
@Calvinp
Contributor

Calvinp commented May 4, 2016

Fix the bug that showed edit request buttons even if config.hideNewRequestButton was true.

@ssalinas

This comment has been minimized.

Show comment
Hide comment
@ssalinas

ssalinas May 5, 2016

Member

👍 didn't realize we never had the config object available for those templates

Member

ssalinas commented May 5, 2016

👍 didn't realize we never had the config object available for those templates

@Calvinp Calvinp added the hs_stable label May 6, 2016

@@ -41,6 +41,7 @@ class DashboardView extends View
requests: pausedRequests
haveRequests: pausedRequests.length > 0
requestsSubFilter: ''
+ hideNewRequestButton: config.hideNewRequestButton

This comment has been minimized.

@Calvinp

Calvinp May 6, 2016

Contributor

This will cause a merge conflict with Dashboard Page Improvements. To resolve, simply keep both of the added lines.

@Calvinp

Calvinp May 6, 2016

Contributor

This will cause a merge conflict with Dashboard Page Improvements. To resolve, simply keep both of the added lines.

@ssalinas ssalinas modified the milestone: 0.6.0 May 6, 2016

@ssalinas

This comment has been minimized.

Show comment
Hide comment
@ssalinas

ssalinas May 6, 2016

Member

Thanks for fixing merge conflict, this looks good 👍

Member

ssalinas commented May 6, 2016

Thanks for fixing merge conflict, this looks good 👍

@ssalinas ssalinas merged commit f70a5d4 into master May 6, 2016

1 of 2 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ssalinas ssalinas deleted the requests-page-improvements branch May 6, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment