Small refactoring, fix deprecation warning

Author: root

Diff for: app/helpers/repository_protected_branches_helper.rb

@@ -47,7 +47,7 @@ def users_for_closed_project
 
 
     def users
-      project.member_principals.map(&:user).compact.uniq
+      project.users_available
     end
 
 

Diff for: app/models/concerns/gitolitable/users.rb

@@ -11,7 +11,7 @@
     .row
       .col-md-6
         %h4= label_with_icon(l('label_user_plural'), 'fa-user')
-        - protected_branch_available_users.each do |user|
+        - @project.users_available.each do |user|
           %p{ style: 'padding: 0px;' }
             %label{ style: 'margin-left: 0; width: auto; font-weight: lighter;' }
               = check_box_tag 'user_ids[]', user.id, @protected_branch.users.include?(user)
@@ -20,7 +20,7 @@
 
       .col-md-6
         %h4= label_with_icon(l('label_group_plural'), 'fa-users')
-        - protected_branch_available_groups.each do |group|
+        - @project.groups_available.each do |group|
           %p{ style: 'padding: 0px;' }
             %label{ style: 'margin-left: 0; width: auto; font-weight: lighter;' }
               = check_box_tag 'group_ids[]', group.id, @protected_branch.groups.include?(group)

Diff for: app/views/repository_protected_branches/_form.html.haml

@@ -33,9 +33,30 @@ def repo_blank_ident
         end
 
 
+        def users_available
+          get_members_available('User')
+        end
+
+
+        def groups_available
+          get_members_available('Group')
+        end
+
+
         private
 
 
+          def get_members_available(klass)
+            scope = old_redmine_version? ? member_principals : memberships.active
+            scope.map(&:principal).select { |m| m.class.name == klass }.uniq.sort
+          end
+
+
+          def old_redmine_version?
+            Redmine::VERSION::MAJOR < 3 || (Redmine::VERSION::MAJOR <= 3 && Redmine::VERSION::MINOR == 0)
+          end
+
+
           def additional_constraints_on_identifier
             if new_record? && !identifier.blank?
               # Make sure that identifier does not match existing repository identifier