YUKI Hiroshi
null+****@clear*****
Thu Oct 4 18:47:18 JST 2012
YUKI Hiroshi 2012-10-04 18:47:18 +0900 (Thu, 04 Oct 2012) New Revision: c1891d626d569c046b4a9725058387927834fad6 https://github.com/groonga/gcs/commit/c1891d626d569c046b4a9725058387927834fad6 Log: Delete DomainDelete view and allow to users to delete domains via an action of DomainController Modified files: public/js/gcs/controllers.js public/js/gcs/router.js public/js/gcs/views.js views/index.jade Modified: public/js/gcs/controllers.js (+10 -1) =================================================================== --- public/js/gcs/controllers.js 2012-10-04 18:17:41 +0900 (df99bdc) +++ public/js/gcs/controllers.js 2012-10-04 18:47:18 +0900 (dd68d39) @@ -113,7 +113,16 @@ App.IndexController = Ember.ArrayController.extend({ }); App.DomainController = Ember.ObjectController.extend({ - selectedAction: null + selectedAction: null, + + delete: function() { + var domainName = this.get('domain').get('name'); + var record = App.store.find(App.Domain, domainName); + if (record && confirm('Do you really want this domain to be deleted?')) { + App.store.deleteRecord(record); + App.store.commit(); + } + } }); App.DomainShowController = Ember.ObjectController.extend({ Modified: public/js/gcs/router.js (+4 -9) =================================================================== --- public/js/gcs/router.js 2012-10-04 18:17:41 +0900 (b6dbaeb) +++ public/js/gcs/router.js 2012-10-04 18:47:18 +0900 (215e3b6) @@ -25,7 +25,6 @@ App.Router = Ember.Router.extend({ gotoDomainSearch: Ember.State.transitionTo('domains.search'), gotoDomainShow: Ember.State.transitionTo('domains.show'), gotoDomainCreate: Ember.State.transitionTo('domains.create'), - gotoDomainDelete: Ember.State.transitionTo('domains.delete'), index: Ember.Route.extend({ route: '/', connectOutlets: function(router) { @@ -42,7 +41,11 @@ App.Router = Ember.Router.extend({ this.connectDomainOutlet(router, domain); var domainController = router.get('domainController'); domainController.set('selectedAction', 'About'); + domainController.set('domain', domain); domainController.connectOutlet('domainShow', domain); + }, + delete: function(router) { + router.get('domainController').delete(); } }), search: Ember.Route.extend(App.WithDomain, { @@ -71,14 +74,6 @@ App.Router = Ember.Router.extend({ applicationController.set('selected', ['DomainCreate']); applicationController.connectOutlet('domainCreate'); } - }), - 'delete': Ember.Route.extend({ - route: 'delete', - connectOutlets: function(router) { - var applicationController = router.get('applicationController'); - applicationController.set('selected', ['DomainDelete']); - applicationController.connectOutlet('domainDelete'); - } }) }), loading: Em.State.extend({}) Modified: public/js/gcs/views.js (+0 -19) =================================================================== --- public/js/gcs/views.js 2012-10-04 18:17:41 +0900 (38d9a06) +++ public/js/gcs/views.js 2012-10-04 18:47:18 +0900 (b49bf81) @@ -72,22 +72,3 @@ App.DomainCreateView = Ember.View.extend({ } }) }); - -App.DomainDeleteView = Ember.View.extend({ - templateName: 'domain-delete', - - DomainDeleteFormView: Ember.View.extend({ - tagName: 'form', - classNames: 'form-horizontal', - - submit: function(event) { - event.preventDefault(); - var domainName = this.get('controller.domainName'); - var record = App.store.find(App.Domain, domainName); - if (record) { - App.store.deleteRecord(record); - App.store.commit(); - } - } - }) -}); Modified: views/index.jade (+1 -17) =================================================================== --- views/index.jade 2012-10-04 18:17:41 +0900 (347942b) +++ views/index.jade 2012-10-04 18:47:18 +0900 (cb5d388) @@ -39,9 +39,6 @@ html {{#view view.NavItemView section="DomainCreate"}} <a href {{action gotoDomainCreate}}><i class="icon-plus"></i> New domain</a> {{/view}} - {{#view view.NavItemView section="DomainDelete"}} - <a href {{action gotoDomainDelete}}><i class="icon-remove"></i> Delete domain</a> - {{/view}} .span10 {{outlet}} @@ -63,7 +60,7 @@ html {{#view view.NavItemView item="Search"}} <a href {{action gotoDomainSearch this.content}}>Search</a> {{/view}} - // <a href {{action gotoDomainDelete}} class="pull-right"><i class="icon-remove"></i> Delete</a> + <a href {{action delete}} class="pull-right"><i class="icon-remove"></i> Delete</a> {{outlet}} @@ -97,19 +94,6 @@ html button(type="submit", class="btn btn-primary") Create {{/view}} - script(data-template-name="domain-delete", type="text/x-handlebars") - h1 Deleting a domain - - {{#view view.DomainDeleteFormView}} - .control-group - label.control-label Domain Name - .controls - {{view Ember.TextField valueBinding="domainName"}} - .control-group - .controls - button(type="submit", class="btn btn-primary") Delete - {{/view}} - script(data-template-name="domain-search", type="text/x-handlebars") {{#view view.SearchFormView}} {{view Ember.TextField valueBinding="query"}} -------------- next part -------------- HTML����������������������������...Download