SAK-34012 fix cancel button and missing wicket id (sakaiproject#5424)

vijaya1618 · Mar 23, 2018 · d2fc729 · d2fc729
1 parent 6afa6d9
commit d2fc729
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/...ebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbCourseGradeChart.java b/...ebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbCourseGradeChart.java
@@ -6,17 +6,17 @@
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebComponent;
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.gradebookng.business.util.FormatHelper;
-import org.sakaiproject.gradebookng.tool.panels.BasePanel;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 /**
  * Panel that renders the course grade chart
  */
-public class GbCourseGradeChart extends BasePanel {
+public class GbCourseGradeChart extends WebComponent {
 
 	private static final long serialVersionUID = 1L;
 

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.html
@@ -25,7 +25,7 @@ <h2><wicket:message key="settingspage.main.heading">Gradebook Setup</wicket:mess
 
 		<div>
 			<input type="button" wicket:id="submit" class="active" wicket:message="value:button.savechanges" />
-			<input type="button" wicket:id="cancel" wicket:message="value:button.cancel" />
+			<input type="submit" wicket:id="cancel" wicket:message="value:button.cancel" />
 		</div>
 	</form>
 

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java
@@ -24,6 +24,7 @@
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.sakaiproject.component.cover.ServerConfigurationService;
@@ -224,14 +225,15 @@ public void onError(final AjaxRequestTarget target, final Form<?> form) {
 		form.add(submit);
 
 		// cancel button
-		final AjaxButton cancel = new AjaxButton("cancel") {
+		final Button cancel = new Button("cancel") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
 			public void onSubmit() {
 				setResponsePage(GradebookPage.class);
 			}
 		};
+
 		cancel.setDefaultFormProcessing(false);
 		form.add(cancel);
 

diff --git a/...ng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeStatisticsPanel.html b/...ng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeStatisticsPanel.html
@@ -4,7 +4,7 @@
 <body>
 	<wicket:panel>
 
-		<canvas id="gradingSchemaChart"></canvas>
+		<canvas wicket:id="gradingSchemaChart" id="gradingSchemaChart"></canvas>
 
 		<div>
 			<input type="button" class="button_color" wicket:id="done" wicket:message="value:button.done" />

diff --git a/...ng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.html b/...ng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.html
@@ -61,7 +61,7 @@ <h3 class="panel-title">
 							<!-- chart -->
 							<div>
 								<div wicket:id="noStudentsWithGradesMessage" class="messageInstruction">There are no students with grades</div>
-								<canvas id="gradingSchemaChart"></canvas>
+								<canvas wicket:id="gradingSchemaChart" id="gradingSchemaChart"></canvas>
 							</div>
 
 							<!--  stats -->

diff --git a/...ng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.java b/...ng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.java
@@ -356,7 +356,7 @@ public boolean isVisible() {
 
 		// chart
 		this.chart = new GbCourseGradeChart("gradingSchemaChart", getCurrentSiteId());
-		add(this.chart);
+		settingsGradingSchemaPanel.add(this.chart);
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up @@
     		<div>
     			<input type="button" wicket:id="submit" class="active" wicket:message="value:button.savechanges" />
-    			<input type="button" wicket:id="cancel" wicket:message="value:button.cancel" />
+    			<input type="submit" wicket:id="cancel" wicket:message="value:button.cancel" />
     		</div>
     	</form>
@@ Expand Down @@