Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from May 6, 2016

Conversation

Calvinp
Copy link
Contributor

@Calvinp Calvinp commented May 4, 2016

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

@ssalinas
Copy link
Member

ssalinas commented May 5, 2016

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

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

@Calvinp Calvinp May 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
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
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants