Skip to content
Open
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
24 changes: 23 additions & 1 deletion app/controllers/account_calendars_api_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,28 @@
# }
# }
# }
#
# @model AccountCalendarList
# {
# "id": "AccountCalendarList",
# "properties": {
# "account_calendars": {
# "description": "List of account calendars",
# "example": ["AccountCalendar"],
# "type": "array",
# "items": {
# "type": "AccountCalendar"
# }
# },
# "total_results": {
# "description": "Total number of account calendars",
# "example": "1"
# "type": "integer"
# }
# }
# }
#

class AccountCalendarsApiController < ApplicationController
include Api::V1::AccountCalendar

Expand All @@ -119,7 +141,7 @@ class AccountCalendarsApiController < ApplicationController
# curl https://<canvas>/api/v1/account_calendars \
# -H 'Authorization: Bearer <token>'
#
# @returns { "account_calendars": [AccountCalendar], "total_results": "integer"}
# @returns AccountCalendarList
def index
GuardRail.activate(:secondary) do
search_term = params[:search_term]
Expand Down
26 changes: 26 additions & 0 deletions app/controllers/outcomes_api_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
# },
# "ratings": {
# "description": "possible ratings for this outcome. included only if the outcome embeds a rubric criterion. omitted in the abbreviated form.",
# "example": ["RubricRating"],
# "type": "array",
# "items": { "$ref" : "RubricRating" }
# },
Expand All @@ -124,6 +125,31 @@
# }
# }
#
# @model RubricRating
# {
# "id": "RubricRating",
# "properties": {
# "id": {
# "example": "name_2",
# "type": "string"
# },
# "criterion_id": {
# "example": "_10",
# "type": "string"
# },
# "description": {
# "type": "string"
# },
# "long_description": {
# "type": "string"
# },
# "points": {
# "example": "5",
# "type": "integer"
# }
# }
# }
#
# @model OutcomeAlignment
# {
# "id": "OutcomeAlignment",
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/rubrics_api_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def used_locations

# @API Creates a rubric using a CSV file
# Returns the rubric import object that was created
# @returns RubricImport
# @returns Rubric
def upload
return unless authorized_action(@context, @current_user, :manage_rubrics)

Expand Down