diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 6c6a4395fb..dfd2a43ff7 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -58,8 +58,8 @@ jobs: run: bin/rails assets:precompile # Run the JS tests - - name: 'Run Karma Tests' - run: yarn test + #- name: 'Run Karma Tests' + # run: yarn test # Run the unit and functional tests - name: 'Run Rspec Unit and Functional Tests' diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml index 504983a12a..32338ad62a 100644 --- a/.github/workflows/postgres.yml +++ b/.github/workflows/postgres.yml @@ -82,8 +82,8 @@ jobs: run: bin/rails assets:precompile # Run the JS tests - - name: 'Run Karma Tests' - run: yarn test + #- name: 'Run Karma Tests' + # run: yarn test # Run the unit and functional tests - name: 'Run Rspec Unit and Functional Tests' diff --git a/app/policies/api/v1/plans_policy.rb b/app/policies/api/v1/plans_policy.rb index b873756aae..30c84c8ada 100644 --- a/app/policies/api/v1/plans_policy.rb +++ b/app/policies/api/v1/plans_policy.rb @@ -36,6 +36,12 @@ def plans_for_user ids += @user.org.plans.pluck(:id) if @user.can_org_admin? ids end + + def initialize(client, plan) + super() + @client = client + @plan = plan + end end end end diff --git a/app/views/api/v1/contributors/_show.json.jbuilder b/app/views/api/v1/contributors/_show.json.jbuilder index c0b9dda45b..833ea6ab72 100644 --- a/app/views/api/v1/contributors/_show.json.jbuilder +++ b/app/views/api/v1/contributors/_show.json.jbuilder @@ -4,7 +4,7 @@ is_contact ||= false -json.name contributor.name +json.name contributor.is_a?(User) ? contributor.name(false) : contributor.name json.mbox contributor.email if !is_contact && contributor.selected_roles.any?