Skip to content
Merged
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
2 changes: 1 addition & 1 deletion app/models/ability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def define_school_teacher_abilities(user:, school:)
can(%i[create], Project) do |project|
school_teacher_can_manage_project?(user:, school:, project:)
end
can(%i[read update show_context], Project, school_id: school.id, lesson: { visibility: %w[teachers students] })
can(%i[read update show_context], Project, school_id: school.id, lesson: { visibility: %w[teachers students], school_class: { teachers: { teacher_id: user.id } } })
teacher_project_ids = Project.where(
school_id: school.id,
remixed_from_id: nil,
Expand Down
16 changes: 8 additions & 8 deletions spec/models/ability_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,15 @@
it { is_expected.not_to be_able_to(:destroy, project) }
end

context 'when user is a school teacher' do
context 'when user is another teacher in the same school' do
before do
create(:teacher_role, user_id: user.id, school:)
end

it { is_expected.to be_able_to(:read, project) }
it { is_expected.to be_able_to(:show_context, project) }
it { is_expected.not_to be_able_to(:read, project) }
it { is_expected.not_to be_able_to(:show_context, project) }
it { is_expected.not_to be_able_to(:create, project) }
it { is_expected.to be_able_to(:update, project) }
it { is_expected.not_to be_able_to(:update, project) }
it { is_expected.not_to be_able_to(:set_finished, project.school_project) }
it { is_expected.not_to be_able_to(:destroy, project) }
end
Expand Down Expand Up @@ -248,15 +248,15 @@
it { is_expected.not_to be_able_to(:destroy, project) }
end

context 'when user is a school teacher' do
context 'when user is another teacher in the same school' do
before do
create(:teacher_role, user_id: user.id, school:)
end

it { is_expected.to be_able_to(:read, project) }
it { is_expected.to be_able_to(:show_context, project) }
it { is_expected.not_to be_able_to(:read, project) }
it { is_expected.not_to be_able_to(:show_context, project) }
it { is_expected.not_to be_able_to(:create, project) }
it { is_expected.to be_able_to(:update, project) }
it { is_expected.not_to be_able_to(:update, project) }
it { is_expected.not_to be_able_to(:set_finished, project.school_project) }
it { is_expected.not_to be_able_to(:destroy, project) }
end
Expand Down
Loading