diff --git a/app/assets/javascripts/components/projects/ProjectCard.jsx b/app/assets/javascripts/components/projects/ProjectCard.jsx index 547e8d296..91ff8766d 100644 --- a/app/assets/javascripts/components/projects/ProjectCard.jsx +++ b/app/assets/javascripts/components/projects/ProjectCard.jsx @@ -62,7 +62,7 @@ const PanelHeading = ({ project, joined, user }) => {
{ {
  • {
  • {I18n.t('projects.unjoin')} @@ -189,7 +189,7 @@ const CardLink = ({ project, joined }) => { return ( {I18n.t('projects.join')} diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb index afc8bca08..a3ff33774 100644 --- a/app/presenters/project_presenter.rb +++ b/app/presenters/project_presenter.rb @@ -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)}/" + } +end def self.from_collection(collection) collection.map { |item| new(item) } diff --git a/spec/javascripts/components/projects/project_card_spec.js b/spec/javascripts/components/projects/project_card_spec.js index 9effd903f..6c1af1e15 100644 --- a/spec/javascripts/components/projects/project_card_spec.js +++ b/spec/javascripts/components/projects/project_card_spec.js @@ -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', diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb index 59c9235cd..8c0a45117 100644 --- a/spec/presenters/project_presenter_spec.rb +++ b/spec/presenters/project_presenter_spec.rb @@ -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