Skip to content

Commit

Permalink
merge master back to staging (#184)
Browse files Browse the repository at this point in the history
* 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 <shaffer@vt.edu>
  • Loading branch information
awhicks and cashaffer authored Nov 1, 2024
1 parent a789ffd commit b3dc336
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/models/ability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 10 additions & 2 deletions app/views/home/books.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" }
Expand All @@ -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'
Expand Down

0 comments on commit b3dc336

Please sign in to comment.