Merge pull request #3344 from hakusaro/change-duration

Skip validation of video duration if user is admin
2017-10-25 18:03:04 -07:00
parent 361196aca4 3a519c2eee
commit 257b2f9fde
1 changed files with 4 additions and 2 deletions
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -101,8 +101,10 @@ class Upload < ApplicationRecord
    end

    def validate_video_duration
-      if is_video? && video.duration > 120
-        raise "video must not be longer than 2 minutes"
+      unless uploader.is_admin?
+        if is_video? && video.duration > 120
+          raise "video must not be longer than 2 minutes"
+        end
      end
    end
  end