diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index ee0c83e..e00c5b2 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -4,6 +4,7 @@ + {{> sAlert}} diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 23fb4af..c1ad74a 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -787,7 +787,7 @@ Template.main.events({ })(); Session.set("user", newSetting); serverData = Session.get("user"); - sendData("editProfile"); + sendData("editProfile"); } $("#" + modifyingInput).next() @@ -972,11 +972,17 @@ function sendData(funcName) { // Call Meteor function, and do actions after func } else { Session.set("currentWork",null); } + if (error !== undefined) { + sAlert.error(error.error[1] || error.message, { + effect: 'stackslide', + position: 'top' + }); + } }); } function closeInput() { // Close a changeable input and change it back to span. - var data = getHomeworkFormData(); + var data = getHomeworkFormData(); Session.set("currentWork", data); Session.set("restrictText", {}); $("#"+modifyingInput).css('cursor','pointer'); diff --git a/hourglass/server/main.js b/hourglass/server/main.js index 7d2673a..a8399bc 100644 --- a/hourglass/server/main.js +++ b/hourglass/server/main.js @@ -218,7 +218,7 @@ function securityCheck(checklist, input) { break; // Comment too long case 15: - if (typeof input.comment !== "string" || input.comment > 200) error = 13; + if (typeof input.comment !== "string" || input.comment.length > 200) error = 13; break; // Private class case 16: