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.

Sign up for GitHub

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

Jump to bottom

fold changes from temporary /perspectivesBeta back into /perspectives #74

Merged
merged 2 commits into from
Nov 1, 2016
Merged

fold changes from temporary /perspectivesBeta back into /perspectives #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b832f50
fold changes from temporary /perspectivesBeta back into /perspectives
iamigo Oct 28, 2016
cd7356d
Merge branch 'master' into move-perspectiveBeta-back-to-perspective
pallavi2209 Nov 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions view/loadView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ const viewmap = {
'/samples/:key/edit': 'admin',
'/perspectives': 'perspective/perspective',
'/perspectives/:key': 'perspective/perspective',
'/perspectivesBeta': 'perspectiveBeta/perspective',
'/perspectivesBeta/:key': 'perspectiveBeta/perspective',
};

/**
Expand Down Expand Up @@ -133,9 +131,7 @@ module.exports = function loadView(app, passport) {
// if url contains a query, render perspective detail page with realtime
// updates
if ((key === '/perspectives' && Object.keys(req.query).length) ||
key === '/perspectives/:key' ||
(key === '/perspectivesBeta' && Object.keys(req.query).length) ||
key === '/perspectivesBeta/:key') {
key === '/perspectives/:key') {
res.render(viewmap[key], templateVars);
} else {
res.render(viewmap[key], trackObj);
Expand Down
2 changes: 1 addition & 1 deletion view/perspective/PerspectiveController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class PerspectiveController extends React.Component {
placeholderText='Search Perspectives'
options={ persNames }
showSearchIcon={ true }
onAddNewButton={ this.openCreatePanel.bind(this) }
onAddNewButton={ values.lenses ? this.openCreatePanel.bind(this) : undefined }
onClickItem={ this.goToUrl.bind(this) }
newButtonText='New Perspective'
/>
Expand Down
Loading