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

Feature/select api list #1584

Merged
merged 17 commits into from
Sep 16, 2016
Merged

Feature/select api list #1584

merged 17 commits into from
Sep 16, 2016

Conversation

frenchbread
Copy link
Contributor

@frenchbread frenchbread commented Sep 14, 2016

Closes #1479

@bajiat
Copy link
Contributor

bajiat commented Sep 16, 2016

@marla-singer Could you review this PR?

@bajiat bajiat added this to the Sprint 31 milestone Sep 16, 2016
@marla-singer
Copy link
Contributor

marla-singer commented Sep 16, 2016

@bajiat Yep

@@ -1,7 +1,7 @@
<template name="dashboardChartsFiltering">
<form class="form-inline pull-left" id="api-frontend-prefix-form">
{{ # if Template.subscriptionsReady }}
{{ > apiBackendSelectPicker apis=apis }}
{{ > apiBackendSelectPicker apisManagedByUser=apisManagedByUser otherApis=otherApis }}
Copy link
Contributor

Choose a reason for hiding this comment

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

The word 'backend' was removed on purpose, please remove Backend from the template name.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@marla-singer
Copy link
Contributor

@frenchbread Please fix conflicts and I'll merge it

@frenchbread
Copy link
Contributor Author

frenchbread commented Sep 16, 2016

@marla-singer Resolved conflicts. Was not able to test it with latest develop though. It's not working for some reason..

@marla-singer marla-singer merged commit d0b4b50 into develop Sep 16, 2016
@marla-singer marla-singer deleted the feature/select-api-list branch September 16, 2016 13:22
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

4 participants