From b3dc336bbd7adcfb9408511e4c1c43bd53bf71d0 Mon Sep 17 00:00:00 2001 From: Alex Hicks Date: Fri, 1 Nov 2024 12:21:21 -0400 Subject: [PATCH] merge master back to staging (#184) * Add CS1 book to supplemental reading books list * Add CS1 course to Canvas course list * Remove instructor ability to create terms --------- Co-authored-by: Cliff Shaffer --- app/models/ability.rb | 2 +- app/views/home/books.html.haml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 608913a3f..6b9d6e097 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -98,7 +98,7 @@ def process_instructor(user) end can [:create, :read], InstBook - can [:create, :read], Term + can [:read], Term can [:create, :read], LatePolicy can [:update, :destroy], InstBook, user_id: user.id can [:create, :read], Organization diff --git a/app/views/home/books.html.haml b/app/views/home/books.html.haml index 302a443dd..4b2245ed4 100644 --- a/app/views/home/books.html.haml +++ b/app/views/home/books.html.haml @@ -33,6 +33,10 @@ to view): %ul + %li + %a{ href: 'https://canvas.instructure.com/enroll/AA7HDH', target: "_blank" } + An objects-first CS1 course + %li %a{ href: 'https://canvas.instructure.com/enroll/TXJGTB', target: "_blank" } Data Structures topics for a CS2-level course @@ -66,6 +70,11 @@ Supplemental reading versions: %ul + %li + - url = @config_url + '/OpenDSA/Books/IntroToSoftwareDesign/index.html' + %a{ href: url , target: "_blank" } + An objects-first CS1 course + %li - url = @config_url + '/OpenDSA/Books/CS2/index.html' %a{ href: url , target: "_blank" } @@ -85,8 +94,7 @@ %li - url = @config_url + '/OpenDSA/Books/CS3notes/index.html' %a{ href: url, target: "_blank" } - Coursenotes form of presentation slides for "CS3" course on Data - Structures. + Coursenotes form of presentation slides for "CS3" course on Data Structures. %li - url = @config_url + '/OpenDSA/Books/CS4104/index.html'