From d07289301b99cbfad589553ca60bf482d24836cf Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 26 Jun 2014 16:30:47 +0200 Subject: [PATCH] Adding checksley validations to backlog --- app/coffee/modules/backlog/lightboxes.coffee | 22 ++++++++++++++++--- .../views/modules/lightbox_add-bulk.jade | 2 +- .../views/modules/lightbox_add-new-us.jade | 2 +- .../views/modules/lightbox_add-sprint.jade | 6 ++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/coffee/modules/backlog/lightboxes.coffee b/app/coffee/modules/backlog/lightboxes.coffee index a0151a20..1c15f82b 100644 --- a/app/coffee/modules/backlog/lightboxes.coffee +++ b/app/coffee/modules/backlog/lightboxes.coffee @@ -93,6 +93,11 @@ CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope) -> $el.on "click", ".button-green", (event) -> event.preventDefault() + + form = $el.find("form").checksley() + if not form.validate() + return + if isNew promise = $repo.create("userstories", $scope.us) broadcastEvent = "usform:new:success" @@ -141,6 +146,10 @@ CreateBulkUserstroriesDirective = ($repo, $rs, $rootscope) -> $el.on "click", ".button-green", (event) -> event.preventDefault() + form = $el.find("form").checksley() + if not form.validate() + return + data = $scope.form.data projectId = $scope.projectId @@ -155,6 +164,15 @@ CreateBulkUserstroriesDirective = ($repo, $rs, $rootscope) -> CreateSprint = ($repo, $rs, $rootscope) -> link = ($scope, $el, attrs) -> + submit = -> + form = $el.find("form").checksley() + if not form.validate() + return + + $repo.create("milestones", $scope.sprint).then (data) -> + $el.addClass("hidden") + $rootscope.$broadcast("sprintform:create:success", data) + $scope.$on "sprintform:create", -> $el.removeClass("hidden") $scope.sprint = { @@ -170,9 +188,7 @@ CreateSprint = ($repo, $rs, $rootscope) -> $el.on "click", ".button-green", (event) -> event.preventDefault() - $repo.create("milestones", $scope.sprint).then (data) -> - $el.addClass("hidden") - $rootscope.$broadcast("sprintform:create:success", data) + submit() $scope.$on "$destroy", -> $el.off() diff --git a/app/partials/views/modules/lightbox_add-bulk.jade b/app/partials/views/modules/lightbox_add-bulk.jade index e630f230..c0ef989d 100644 --- a/app/partials/views/modules/lightbox_add-bulk.jade +++ b/app/partials/views/modules/lightbox_add-bulk.jade @@ -3,6 +3,6 @@ a.close(href="", title="close") form h2.title(tg-i18n="common.new-bulk") fieldset - textarea(tg-i18n="placeholder:common.one-item-line", ng-model="form.data") + textarea(tg-i18n="placeholder:common.one-item-line", ng-model="form.data", data-required="true") a.button.button-green(href="", tg-i18n="title:common.save") span(tg-i18n="common.save") diff --git a/app/partials/views/modules/lightbox_add-new-us.jade b/app/partials/views/modules/lightbox_add-new-us.jade index 94a0f522..6b1acd2e 100644 --- a/app/partials/views/modules/lightbox_add-new-us.jade +++ b/app/partials/views/modules/lightbox_add-new-us.jade @@ -3,7 +3,7 @@ a.close(href="", title="close") form h2.title(tg-i18n="us.title-new") fieldset - input(type="text", ng-model="us.subject", tg-i18n="placeholder:common.subject") + input(type="text", ng-model="us.subject", tg-i18n="placeholder:common.subject", data-required="true") fieldset select(ng-model="us.status", ng-options="s.id as s.name for s in statusList", tg-i18n="placeholder:common.status") diff --git a/app/partials/views/modules/lightbox_add-sprint.jade b/app/partials/views/modules/lightbox_add-sprint.jade index 12769d5a..da25927d 100644 --- a/app/partials/views/modules/lightbox_add-sprint.jade +++ b/app/partials/views/modules/lightbox_add-sprint.jade @@ -4,9 +4,9 @@ form h2.title New Sprint fieldset label.last-sprint-name last sprint is {{sprintname}} ;-) - input(ng-model="sprint.name", type="text", placeholder="sprint name", name="name") + input(ng-model="sprint.name", type="text", placeholder="sprint name", name="name", data-required="true") fieldset.dates - input.date-start(tg-date-selector, ng-model="sprint.estimated_start", type="text", placeholder="Estimated Start") - input.date-end(tg-date-selector, ng-model="sprint.estimated_finish", type="text", placeholder="Estimated End") + input.date-start(tg-date-selector, ng-model="sprint.estimated_start", type="text", placeholder="Estimated Start", data-required="true") + input.date-end(tg-date-selector, ng-model="sprint.estimated_finish", type="text", placeholder="Estimated End", data-required="true") a.button.button-green(href="", title="Save") span Create