Merge pull request #745 from Joerit/devel

PowerKiKi · web-flow · commit 0d1689941f69 · 2020-02-14T18:57:18.000+09:00
fix unneccesary checking of duplicate repositories
diff --git a/app/forms/plugin_settings_validation/redmine_config.rb b/app/forms/plugin_settings_validation/redmine_config.rb
@@ -46,7 +46,7 @@ module RedmineConfig
     # Check duplication if we are switching from a mode to another
     #
     def check_for_duplicated_repo
-      return if !Additionals.true?(current_setting(:hierarchical_organisation)) && Additionals.true?(hierarchical_organisation)
+      return if Additionals.true?(hierarchical_organisation)
       return unless Repository::Xitolite.have_duplicated_identifier?
 
       errors.add(:base, 'Detected non-unique repository identifiers. Cannot switch to flat mode')

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ module RedmineConfig`
`46`	`46`	`# Check duplication if we are switching from a mode to another`
`47`	`47`	`#`
`48`	`48`	`def check_for_duplicated_repo`
`49`		`- return if !Additionals.true?(current_setting(:hierarchical_organisation)) && Additionals.true?(hierarchical_organisation)`
	`49`	`+ return if Additionals.true?(hierarchical_organisation)`
`50`	`50`	`return unless Repository::Xitolite.have_duplicated_identifier?`
`51`	`51`
`52`	`52`	`errors.add(:base, 'Detected non-unique repository identifiers. Cannot switch to flat mode')`