diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java | 2 | ||||
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1403_add_organization_uuid_to_groups.rb | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java index 5c52cef1c23..94207c0b7ca 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java @@ -419,7 +419,7 @@ public class UserUpdater { @Override public boolean apply(@Nullable GroupDto input) { - return input != null && input.getKey().equals(key); + return input != null && input.getName().equals(key); } } } diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1403_add_organization_uuid_to_groups.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1403_add_organization_uuid_to_groups.rb new file mode 100644 index 00000000000..d1a3dadd314 --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1403_add_organization_uuid_to_groups.rb @@ -0,0 +1,29 @@ +# +# SonarQube, open source software quality management tool. +# Copyright (C) 2008-2014 SonarSource +# mailto:contact AT sonarsource DOT com +# +# SonarQube is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3 of the License, or (at your option) any later version. +# +# SonarQube is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +# +# SonarQube 6.2 +# +class AddOrganizationUuidToGroups < ActiveRecord::Migration + + def self.up + execute_java_migration('org.sonar.db.version.v62.AddOrganizationUuidToGroups') + end +end |