Merge pull request #178 from fbernitt/issue_5217_allow_registration

Added allow_registration toggle.

3 files changed, 17 insertions, 6 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5951413..a623653 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -26,7 +26,11 @@ class UsersController < UsersBaseController
   end
 
   def new
-    @user = User.new
+    if APP_CONFIG[:allow_registration]
+      @user = User.new
+    else
+      redirect_to home_path
+    end
   end
 
   def show
diff --git a/app/controllers/v1/users_controller.rb b/app/controllers/v1/users_controller.rb
index 006e6d8..881708a 100644
--- a/app/controllers/v1/users_controller.rb
+++ b/app/controllers/v1/users_controller.rb
@@ -19,8 +19,12 @@ module V1
     end
 
     def create
-      @user = Account.create(params[:user])
-      respond_with @user # return ID instead?
+      if APP_CONFIG[:allow_registration]
+        @user = Account.create(params[:user])
+        respond_with @user # return ID instead?
+      else
+        head :forbidden
+      end
     end
 
     def update
diff --git a/app/views/common/_action_buttons.html.haml b/app/views/common/_action_buttons.html.haml
index 266abe1..81ebf67 100644
--- a/app/views/common/_action_buttons.html.haml
+++ b/app/views/common/_action_buttons.html.haml
@@ -3,9 +3,12 @@
     .login.span4
       %span.link= btn icon('ok-sign') + t(:login), login_path
       %span.info= t(:login_info, default: "")
-    .signup.span4
-      %span.link= btn icon('user') + t(:signup), signup_path
-      %span.info= t(:signup_info, default: "")
+    - if APP_CONFIG[:allow_registration]
+      .signup.span4
+        %span.link= btn icon('user') + t(:signup), signup_path
+        %span.info= t(:signup_info, default: "")
+    - else
+      .signup.span4
     .help.span4
       %span.link= btn icon('question-sign') + t(:get_help), new_ticket_path
       %span.info= t(:support_info, default: "")