Yoji SHIDARA
null+****@clear*****
Thu Nov 15 17:04:01 JST 2012
Yoji SHIDARA 2012-11-15 17:04:01 +0900 (Thu, 15 Nov 2012) New Revision: c9832ca72a9afe4fc529adac26cbdc7fb95305a5 https://github.com/groonga/gcs-console/commit/c9832ca72a9afe4fc529adac26cbdc7fb95305a5 Log: Confirm before deleting index field Modified files: test/index-fields.test.js views/domain-index-fields.jade Modified: test/index-fields.test.js (+2 -0) =================================================================== --- test/index-fields.test.js 2012-11-15 15:00:40 +0900 (8f8524b) +++ test/index-fields.test.js 2012-11-15 17:04:01 +0900 (efefc65) @@ -38,6 +38,8 @@ suite('dashboard', function() { assert.equal(browser.text(".alert"), "IndexField successfully created"); }) .then(function() { + assert.equal(browser.text("h3"), "Delete 'test' Index Field"); + assert.equal(browser.text(".modal-body p"), "Are you sure?"); return browser.pressButton('Delete') }) .then(function() { Modified: views/domain-index-fields.jade (+18 -6) =================================================================== --- views/domain-index-fields.jade 2012-11-15 15:00:40 +0900 (1832758) +++ views/domain-index-fields.jade 2012-11-15 17:04:01 +0900 (414003a) @@ -25,12 +25,24 @@ block domain-content td td td - form(action="/domain/"+domain.DomainName+"/index_fields/"+indexField.Options.IndexFieldName, method="POST").modal-form - input(type="hidden", name="_method", value="DELETE") - button(type="submit").btn.btn-danger - i.icon-trash.icon-white - | Delete - // TODO confirmation + a.btn.btn-danger.pull-right(role="button", data-toggle="modal", data-target="#deleteDialog-"+indexField.Options.IndexFieldName) + i.icon-trash.icon-white + | Delete + + for indexField in indexFields + .modal.hide(id="deleteDialog-"+indexField.Options.IndexFieldName, role="dialog", tabindex="-1", aria-labelledby="deleteDialogLabel", aria-hidden="true") + .modal-header + button.close(type="button", data-dismiss="modal", aria-hidden="true") × + h3#deleteDialogLabel Delete '#{indexField.Options.IndexFieldName}' Index Field + .modal-body + p Are you sure? + .modal-footer + form(action="/domain/"+domain.DomainName+"/index_fields/"+indexField.Options.IndexFieldName, method="POST").modal-form + input(type="hidden", name="_method", value="DELETE") + button.btn(data-dismiss="modal", aria-hidden="true") Cancel + button.btn(type="submit").btn.btn-danger + i.icon-trash.icon-white + | Delete else .alert.alert-warn No IndexField is defined -------------- next part -------------- HTML����������������������������...Download