diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index c674b1daae..f8d3ceb721 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -23,7 +23,6 @@ //= require ./products/products //= require ./shipping_methods/shipping_methods //= require ./users/users -//= require ./welcome/welcome //= require textAngular.min.js //= require textAngular-sanitize.min.js diff --git a/app/assets/javascripts/admin/welcome/controllers/welcome_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/sells_controller.js.coffee similarity index 78% rename from app/assets/javascripts/admin/welcome/controllers/welcome_controller.js.coffee rename to app/assets/javascripts/admin/enterprises/controllers/sells_controller.js.coffee index 8db38181c4..37e16fc012 100644 --- a/app/assets/javascripts/admin/welcome/controllers/welcome_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprises/controllers/sells_controller.js.coffee @@ -1,5 +1,5 @@ -angular.module("admin.welcome") - .controller "welcomeCtrl", ($scope) -> +angular.module("admin.enterprises") + .controller "sellsCtrl", ($scope) -> $scope.sells = "unspecified" $scope.producer_profile_only = true $scope.submitted = false diff --git a/app/assets/javascripts/admin/welcome/welcome.js.coffee b/app/assets/javascripts/admin/welcome/welcome.js.coffee deleted file mode 100644 index ccb0fb5d0a..0000000000 --- a/app/assets/javascripts/admin/welcome/welcome.js.coffee +++ /dev/null @@ -1 +0,0 @@ -angular.module("admin.welcome", []) \ No newline at end of file diff --git a/app/views/spree/admin/overview/_change_type_form.html.haml b/app/views/spree/admin/overview/_change_type_form.html.haml index 041c0b15e2..7f3108f90a 100644 --- a/app/views/spree/admin/overview/_change_type_form.html.haml +++ b/app/views/spree/admin/overview/_change_type_form.html.haml @@ -1,4 +1,5 @@ -= form_for @enterprise, url: main_app.set_sells_admin_enterprise_path(@enterprise), html: { name: "enterprise", novalidate: true } do |enterprise_form| += form_for @enterprise, url: main_app.set_sells_admin_enterprise_path(@enterprise), + html: { name: "enterprise", novalidate: true, "ng-app" => "admin.enterprises", "ng-controller"=> 'sellsCtrl' } do |enterprise_form| -# Have to use hidden:'true' on this input rather than type:'hidden' as the latter seems to break ngPattern and therefore validation %input{ hidden: "true", name: "sells", ng: { required: true, pattern: "/^(none|own)$/", model: 'sells', value: "sells"} } .options.sixteen.columns.alpha diff --git a/app/views/spree/admin/overview/welcome.html.haml b/app/views/spree/admin/overview/welcome.html.haml index 1934db1706..cfe5593d99 100644 --- a/app/views/spree/admin/overview/welcome.html.haml +++ b/app/views/spree/admin/overview/welcome.html.haml @@ -1,4 +1,4 @@ -#welcome_page.sixteen.columns.alpha{ ng: { app: "admin.welcome", controller: 'welcomeCtrl' } } +#welcome_page.sixteen.columns.alpha %header %h1 Welcome to the Open Food Network! %p