Allow plugins for non-premium

Arie · May 11, 2020 · 2ae1a89 · 2ae1a89
1 parent a1cf52a
commit 2ae1a89
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/app/behaviour/reservation_validations.rb b/app/behaviour/reservation_validations.rb
@@ -14,7 +14,6 @@ def self.included(mod)
       validates_with Reservations::OnlyOneFutureReservationPerUserValidator,  unless: :donator?
       validates_with Reservations::StartsNotTooFarInFutureValidator,          unless: :donator?
       validates_with Reservations::MapIsValidValidator
-      validates_with Reservations::PluginsDisabledValidator,                  unless: :gameye?
       validates_with Reservations::GameyeLocationSelectedValidator,           if: :gameye?
       validates_with Reservations::CustomWhitelistValidator
 

diff --git a/app/validators/reservations/plugins_disabled_validator.rb b/app/validators/reservations/plugins_disabled_validator.rb
diff --git a/app/views/reservations/_form.html.haml b/app/views/reservations/_form.html.haml
@@ -44,8 +44,8 @@
       = f.input :rcon,                as: :string, placeholder: "The RCON password to control the server",          disabled: !@reservation.schedulable?
       = f.input :first_map,           collection: MapUpload.available_maps, :input_html => { :class => "select2" }, disabled: !@reservation.schedulable?
       = f.input :tv_password,         as: :string,   placeholder: "Password for STV, default tv",                   disabled: !@reservation.schedulable?
-      = f.input :enable_plugins,      as: :boolean,  hint: "Enable SOAP DM and MGE (premium only)",                 disabled: (!current_user.donator? || !@reservation.schedulable? )
-      = f.input :enable_demos_tf,     as: :boolean,  hint: "Enable uploading STVs to demos.tf (and get SOAP+MGE too for free)", disabled: !@reservation.schedulable?
+      = f.input :enable_plugins,      as: :boolean,  hint: "Enable plugins",                                        disabled: !@reservation.schedulable?
+      = f.input :enable_demos_tf,     as: :boolean,  hint: "Enable uploading STVs to demos.tf",                     disabled: !@reservation.schedulable?
       = f.association :server_config, collection: ServerConfig.ordered, hint: "Specify a league config to run on each map start", input_html: { class: "select2" }
       = f.input :whitelist_type, :label => "Item whitelist" do
         .form-control.whitelist
@@ -74,5 +74,5 @@
     = render "datepicker_javascript_options"
 
     :javascript
-      var canEnablePlugins = #{(!current_user.donator? || !@reservation.schedulable? )};
+      var canEnablePlugins = #{@reservation.schedulable?};
       var reservationSchedulable = #{@reservation.schedulable?}
diff --git a/spec/models/reservation_spec.rb b/spec/models/reservation_spec.rb
@@ -269,12 +269,9 @@
       reservation.should have(1).errors_on(:server_id)
     end
 
-    it "doesn't allow plugins for non donators" do
+    it "allows plugins for non donators" do
       reservation = build :reservation
       reservation.enable_plugins = true
-      reservation.should have(1).errors_on(:enable_plugins)
-
-      reservation.user.stub(donator?: true)
       reservation.should have(:no).errors_on(:enable_plugins)
     end