Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions app/assets/javascripts/components/projects/ProjectCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const PanelHeading = ({ project, joined, user }) => {
</div>
<div className="icons pull-right">
<a
href={project.get('path_to').projectReports}
href={project.get('path_to').project_reports}
className="unstyled-link"
data-toggle="tooltip"
data-placement="top"
Expand All @@ -73,7 +73,7 @@ const PanelHeading = ({ project, joined, user }) => {
</a>

<a
href={project.get('path_to').projectUsers}
href={project.get('path_to').project_users}
className="unstyled-link"
data-toggle="tooltip"
data-placement="top"
Expand Down Expand Up @@ -102,7 +102,7 @@ const PanelHeading = ({ project, joined, user }) => {

<li>
<a
href={project.get('path_to').projectSettings}
href={project.get('path_to').project_settings}
data-toggle="tooltip"
data-placement="top"
data-title={I18n.t('settings')}
Expand All @@ -115,7 +115,7 @@ const PanelHeading = ({ project, joined, user }) => {

<li>
<a
href={`${project.get('path_to').projectUnjoin}${user.id}`}
href={`${project.get('path_to').project_unjoin}${user.id}`}
data-method="delete"
>
{I18n.t('projects.unjoin')}
Expand Down Expand Up @@ -189,7 +189,7 @@ const CardLink = ({ project, joined }) => {

return (
<a
href={project.get('path_to').projectJoin}
href={project.get('path_to').project_join}
className="card-footer panel-footer"
>
{I18n.t('projects.join')}
Expand Down
20 changes: 10 additions & 10 deletions app/presenters/project_presenter.rb
Comment thread
codeclara42 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ def archived_date
I18n.l(archived_at, format: :note_date) if archived_at
end

def path_to
{
project: "/projects/#{slug}",
projectReports: "/projects/#{slug}/reports",
projectUsers: "/projects/#{slug}/users",
projectSettings: "/projects/#{slug}/edit",
projectJoin: "/projects/#{slug}/join",
projectUnjoin: "/projects/#{slug}/users/"
}
end
def path_to
{
project: project_path(self),
project_reports: reports_project_path(self),
project_users: project_users_path(self),
project_settings: edit_project_path(self),
project_join: join_project_path(self),
project_unjoin: "#{project_users_path(self)}/"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why is project_unjoin using string interpolation here? I think the interpolation and trailing / could be added in ProjectCard.jsx, where the full path is built.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

on this specific route it ended with "/" on the .spec file (the project presenter one)
not sure why

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

checking the original spec/presenters/project_presenter_spec.rb before changes, you can see this specific route is the only one with a "/" on the end, the other ones don't have that. I mantained the original route, keeping it with "/" on the end in all files (including .rb files)

}
end

def self.from_collection(collection)
collection.map { |item| new(item) }
Expand Down
10 changes: 5 additions & 5 deletions spec/javascripts/components/projects/project_card_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ const projectFactory = tag_name => {
slug: 'foobar',
path_to: {
project: '/projects/foobar',
projectReports: '/projects/foobar/reports',
projectUsers: '/projects/foobar/users',
projectSettings: '/projects/foobar/edit',
projectJoin: '/projects/foobar/join',
projectUnjoin: '/projects/foobar/users/',
project_reports: '/projects/foobar/reports',
project_users: '/projects/foobar/users',
project_settings: '/projects/foobar/edit',
project_join: '/projects/foobar/join',
project_unjoin: '/projects/foobar/users/',
},
archived_at: null,
velocity: '10',
Expand Down
10 changes: 5 additions & 5 deletions spec/presenters/project_presenter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
describe '#path_to' do
it 'should return all paths' do
expect(project.path_to).to eq(project: '/projects/test-project-foobar',
projectReports: '/projects/test-project-foobar/reports',
projectUsers: '/projects/test-project-foobar/users',
projectSettings: '/projects/test-project-foobar/edit',
projectJoin: '/projects/test-project-foobar/join',
projectUnjoin: '/projects/test-project-foobar/users/')
project_reports: '/projects/test-project-foobar/reports',
project_users: '/projects/test-project-foobar/users',
project_settings: '/projects/test-project-foobar/edit',
project_join: '/projects/test-project-foobar/join',
project_unjoin: '/projects/test-project-foobar/users/')
end
end
end