Skip to content

Commit cc4dc2a

Browse files
authored
Merge pull request #2355 from openstax/fix_exercise_edit_urls
Fixed the exercise edit URLs (for admins)
2 parents d7ad0af + b101839 commit cc4dc2a

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

app/routines/export_exercise_exclusions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def page_urls_by_pages
6262
def exercise_urls_by_exercise_numbers
6363
@exercise_urls_by_exercise_numbers ||= {}.tap do |hash|
6464
all_excluded_exercise_numbers.each do |number|
65-
hash[number] = OpenStax::Exercises::V1.uri_for("/exercises/#{number}").to_s
65+
hash[number] = OpenStax::Exercises::V1.uri_for("/exercise/#{number}").to_s
6666
end
6767
end
6868
end

lib/openstax/exercises/v1/exercise.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def uid
4040
end
4141

4242
def url
43-
@url ||= "#{@server_url}/exercises/#{uid}"
43+
@url ||= "#{@server_url}/exercise/#{uid}"
4444
end
4545

4646
def nickname
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Course ID,Course Name,Course Type,Teachers,# Exclusions,Excluded Exercise Numbers,Excluded Exercise URLs,Exclusion Timestamps,CNX Book Title,CNX Book UUID,CNX Book Locations,CNX Page UUIDs,CNX Page URLs
2-
66,cum nobis consectetur,Tutor,Bob Martin,4,"-4, -3, -2, -1","https://exercises-dev.openstax.org/exercises/-4, https://exercises-dev.openstax.org/exercises/-3, https://exercises-dev.openstax.org/exercises/-2, https://exercises-dev.openstax.org/exercises/-1","2017-09-25T21:34:40.085Z, 2017-09-25T21:34:40.096Z, 2017-09-25T21:34:40.107Z, 2017-09-25T21:34:40.117Z",saepe nam mollitia,929ad821-5801-4272-9186-ffb0c047ec08,"1.1, 1.2, 1.2, null","3480b873-4599-4e23-b139-afb532da162b, 5329c45e-5681-457d-b606-d3bab430162c, 5329c45e-5681-457d-b606-d3bab430162c, null","https://staging-tutor.cnx.org/contents/3480b873-4599-4e23-b139-afb532da162b, https://staging-tutor.cnx.org/contents/5329c45e-5681-457d-b606-d3bab430162c, https://staging-tutor.cnx.org/contents/5329c45e-5681-457d-b606-d3bab430162c, null"
2+
66,cum nobis consectetur,Tutor,Bob Martin,4,"-4, -3, -2, -1","https://exercises-dev.openstax.org/exercise/-4, https://exercises-dev.openstax.org/exercise/-3, https://exercises-dev.openstax.org/exercise/-2, https://exercises-dev.openstax.org/exercise/-1","2017-09-25T21:34:40.085Z, 2017-09-25T21:34:40.096Z, 2017-09-25T21:34:40.107Z, 2017-09-25T21:34:40.117Z",saepe nam mollitia,929ad821-5801-4272-9186-ffb0c047ec08,"1.1, 1.2, 1.2, null","3480b873-4599-4e23-b139-afb532da162b, 5329c45e-5681-457d-b606-d3bab430162c, 5329c45e-5681-457d-b606-d3bab430162c, null","https://staging-tutor.cnx.org/contents/3480b873-4599-4e23-b139-afb532da162b, https://staging-tutor.cnx.org/contents/5329c45e-5681-457d-b606-d3bab430162c, https://staging-tutor.cnx.org/contents/5329c45e-5681-457d-b606-d3bab430162c, null"

spec/lib/openstax/exercises/v1/exercise_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
expect(exercise.preview).to be_nil
2020
expect(exercise.context).to eq context
2121
expect(exercise.content).to eq content
22-
expect(exercise.url).to eq "#{OpenStax::Exercises::V1.server_url}/exercises/#{hash[:uid]}"
22+
expect(exercise.url).to eq "#{OpenStax::Exercises::V1.server_url}/exercise/#{hash[:uid]}"
2323
expect(exercise.nickname).to eq nickname
2424
expect(exercise.title).to eq title
2525
expect(exercise.question_answers[0].length).to eq 2

spec/routines/export_exercise_exclusions_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
specify 'with urls' do
8585
ee_numbers_urls = ee_numbers.map do |number|
86-
OpenStax::Exercises::V1.uri_for("/exercises/#{number}").to_s
86+
OpenStax::Exercises::V1.uri_for("/exercise/#{number}").to_s
8787
end
8888
expect(output[:excluded_exercises_hash].map(&:exercise_url)).to(
8989
match_array ee_numbers_urls
@@ -123,7 +123,7 @@
123123
excluded_exercises = @course.excluded_exercises.sort_by(&:exercise_number)
124124
ee_numbers = excluded_exercises.map(&:exercise_number)
125125
ee_numbers_urls = ee_numbers.map do |number|
126-
OpenStax::Exercises::V1.uri_for("/exercises/#{number}").to_s
126+
OpenStax::Exercises::V1.uri_for("/exercise/#{number}").to_s
127127
end
128128
exclusion_dates = excluded_exercises.map do |ee|
129129
DateTimeUtilities.to_api_s(ee.created_at)
@@ -192,7 +192,7 @@
192192

193193
specify 'exercise url' do
194194
exercise_urls = [@ee_1, @ee_2, @ee_3, @ee_removed].map do |ee|
195-
OpenStax::Exercises::V1.uri_for("/exercises/#{ee.exercise_number}").to_s
195+
OpenStax::Exercises::V1.uri_for("/exercise/#{ee.exercise_number}").to_s
196196
end
197197
outputs_by_exercise.each{ |output| expect(output[:exercise_url]).to be_in exercise_urls }
198198
end
@@ -232,7 +232,7 @@
232232
it 'includes all the correct data' do
233233
exercise_numbers = [@ee_1, @ee_2, @ee_3, @ee_removed].map(&:exercise_number)
234234
exercise_urls = exercise_numbers.map do |exercise_number|
235-
OpenStax::Exercises::V1.uri_for("/exercises/#{exercise_number}").to_s
235+
OpenStax::Exercises::V1.uri_for("/exercise/#{exercise_number}").to_s
236236
end
237237
pages = [@page_1, @page_2, @page_removed, @exercise_another_eco.page]
238238
page_uuids = pages.map(&:uuid)

0 commit comments

Comments
 (0)