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

add "getRepositoryUrl" in order to support repository package.json property as object #204

Merged
merged 11 commits into from
Mar 11, 2016
Merged

add "getRepositoryUrl" in order to support repository package.json property as object #204

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f305916
add "getRepositoryUrl" in order to support repository package.json pr…
mattiaerre Mar 11, 2016
fdb48ab
fix syntax
mattiaerre Mar 11, 2016
d9cd9f6
add type check using underscore
mattiaerre Mar 11, 2016
0d66702
update readme
mattiaerre Mar 11, 2016
c2af490
Fix travis forks PRs
matteofigus Mar 11, 2016
905a666
Merge pull request #206 from opentable/fix-travis
matteofigus Mar 11, 2016
9a3144c
add "getRepositoryUrl" in order to support repository package.json pr…
mattiaerre Mar 11, 2016
e169bc8
fix syntax
mattiaerre Mar 11, 2016
9e5d97e
add type check using underscore
mattiaerre Mar 11, 2016
cd75a0e
update readme
mattiaerre Mar 11, 2016
96757ab
Merge branch 'master' of https://github.com/mattiaerre/oc
mattiaerre Mar 11, 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
14 changes: 13 additions & 1 deletion registry/routes/component-info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,19 @@ module.exports = function(repository){
return param.example;
});
}


component.getRepositoryUrl = function() {
if (typeof this.repository === 'object') {
Copy link
Member

Choose a reason for hiding this comment

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

can we just use underscore's _.isObject for consistency?

if (this.repository.url) {
return this.repository.url;
}
}
if (typeof this.repository === 'string') {
Copy link
Member

Choose a reason for hiding this comment

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

and _.isString(...) here

return this.repository;
}
return null;
};

return res.render('component-info', {
component: component,
dependencies: _.keys(component.dependencies),
Expand Down
2 changes: 1 addition & 1 deletion registry/views/component-info.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ block content
span(class='component-state-' + component.oc.state.toLowerCase())= component.oc.state

h3 Component Info
+property('Repository', component.repository || 'not available', !!component.repository)
+property('Repository', component.getRepositoryUrl() || 'not available', !!component.getRepositoryUrl())
+property('Author', component.author || 'not available')
+property('Publish date', new Date(component.oc.date) || 'not available')
+property('Publish agent', ('OC CLI ' + component.oc.version) || 'not available')
Expand Down