From f1f8198b85430d655cdd55d4aa4b352cb5307687 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Thu, 14 Nov 2019 17:23:18 +0000 Subject: [PATCH 1/5] The External Tools now have a version property. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The external tools have a version property that says what LTI version the tool is using (eg 1.1 or 1.3). Although this isn’t documented on https://canvas.instructure.com/doc/api/external_tools.html#method.external_tools.index it appears to be returned without asking for any additional options. --- src/main/java/edu/ksu/canvas/model/ExternalTool.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/edu/ksu/canvas/model/ExternalTool.java b/src/main/java/edu/ksu/canvas/model/ExternalTool.java index 7ef97ab1..ad8b750c 100644 --- a/src/main/java/edu/ksu/canvas/model/ExternalTool.java +++ b/src/main/java/edu/ksu/canvas/model/ExternalTool.java @@ -24,6 +24,8 @@ public class ExternalTool extends BaseCanvasModel implements Serializable { private String configType; private String configXml; private String configUrl; + // The LTI version eg, 1.1 or 1.3 + private String version; private Map customFields; //These navigation settings are problematic. The possible values in these maps are documented //at https://canvas.instructure.com/doc/api/external_tools.html#method.external_tools.create @@ -173,6 +175,14 @@ public void setConfigUrl(String configUrl) { this.configUrl = configUrl; } + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + /** * A map of Canvas specific custom fields that will be added to the LTI launch request. * See Variable Subsitution docs From 032e571b0e4d090bead466bcc7e520cde5b2953c Mon Sep 17 00:00:00 2001 From: Miguel Pellicer Date: Fri, 15 Nov 2019 13:14:51 +0100 Subject: [PATCH 2/5] Assignment: Support omit_from_final_grade parameter --- .../edu/ksu/canvas/model/assignment/Assignment.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/ksu/canvas/model/assignment/Assignment.java b/src/main/java/edu/ksu/canvas/model/assignment/Assignment.java index c218efa7..0055277c 100644 --- a/src/main/java/edu/ksu/canvas/model/assignment/Assignment.java +++ b/src/main/java/edu/ksu/canvas/model/assignment/Assignment.java @@ -56,7 +56,7 @@ public class Assignment extends BaseCanvasModel implements Serializable{ private LockInfo lockInfo; private String lockExplanation; private Boolean notifyOfUpdate; - + private Boolean omitFromFinalGrade; public Integer getId() { return id; @@ -398,6 +398,15 @@ public void setNotifyOfUpdate(Boolean notifyOfUpdate) { this.notifyOfUpdate = notifyOfUpdate; } + @CanvasField(postKey = "omit_from_final_grade") + public Boolean isOmitFromFinalGrade() { + return omitFromFinalGrade; + } + + public void setOmitFromFinalGrade(Boolean omitFromFinalGrade) { + this.omitFromFinalGrade = omitFromFinalGrade; + } + public class ExternalToolTagAttribute implements Serializable { private static final long serialVersionUID = 1L; From ef3e2a46d84d58f8b378437e70f4721e243ac4f9 Mon Sep 17 00:00:00 2001 From: Toby Murray Date: Fri, 15 Nov 2019 14:42:18 -0600 Subject: [PATCH 3/5] Add some extra javadoc because this is an undocumented field --- src/main/java/edu/ksu/canvas/model/ExternalTool.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/edu/ksu/canvas/model/ExternalTool.java b/src/main/java/edu/ksu/canvas/model/ExternalTool.java index ad8b750c..947f9cfa 100644 --- a/src/main/java/edu/ksu/canvas/model/ExternalTool.java +++ b/src/main/java/edu/ksu/canvas/model/ExternalTool.java @@ -175,6 +175,11 @@ public void setConfigUrl(String configUrl) { this.configUrl = configUrl; } + /** + * The LTI version that this tool uses. Example values: 1.1, 1.3 + * This field is not documented in the Canvas API docs + * @return LTI version used by this tool + */ public String getVersion() { return version; } From ee06ff681183d59813c623550676eda988120f30 Mon Sep 17 00:00:00 2001 From: Toby Murray Date: Fri, 15 Nov 2019 14:53:06 -0600 Subject: [PATCH 4/5] Specifying default tag format Makes the release process slightly more automatic --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index ca29b09a..a301c305 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,10 @@ org.apache.maven.plugins maven-release-plugin 2.5.1 + + deploy + @{version} + org.apache.maven.plugins From 7f3ac6a46d7ba1f4462d66946261c67181010f15 Mon Sep 17 00:00:00 2001 From: Toby Murray Date: Fri, 15 Nov 2019 15:02:46 -0600 Subject: [PATCH 5/5] Fix some javadoc warnings --- .../java/edu/ksu/canvas/interfaces/ContentMigrationReader.java | 1 + .../edu/ksu/canvas/requestOptions/UpdateCourseTabOptions.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/edu/ksu/canvas/interfaces/ContentMigrationReader.java b/src/main/java/edu/ksu/canvas/interfaces/ContentMigrationReader.java index 16e27149..ed20b9b7 100644 --- a/src/main/java/edu/ksu/canvas/interfaces/ContentMigrationReader.java +++ b/src/main/java/edu/ksu/canvas/interfaces/ContentMigrationReader.java @@ -9,6 +9,7 @@ public interface ContentMigrationReader extends CanvasReader