[api] fix the API for flag inheritance project to package

openSUSE · Oct 31, 2016 · 5c4ecc2 · 5c4ecc2
1 parent c7fdc91
commit 5c4ecc2
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/api/app/models/flag.rb b/src/api/app/models/flag.rb
@@ -58,17 +58,14 @@ def default_status
     all_flag = main_object.flags.where("flag = ? AND repo IS NULL AND architecture_id IS NULL", flag).first
     repo_flag = main_object.flags.where("flag = ? AND repo = ? AND architecture_id IS NULL", flag, repo).first
     arch_flag = main_object.flags.where("flag = ? AND repo IS NULL AND architecture_id = ?", flag, architecture_id).first
-
+    same_flag = main_object.flags.where("flag = ? AND repo = ? AND architecture_id = ?", flag, repo, architecture_id).first
     # Package settings only override project settings...
     if main_object.kind_of? Package
+      # do the same_flag check first to see if all_flag or same_flag had been set on package level, they *both* overwrite the project level
+      same_flag = main_object.project.flags.where("flag = ? AND repo = ? AND architecture_id = ?", flag, repo, architecture_id).first unless all_flag || same_flag || repo_flag || arch_flag
+      repo_flag = main_object.project.flags.where("flag = ? AND repo = ? AND architecture_id IS NULL", flag, repo).first unless all_flag || repo_flag || arch_flag
+      arch_flag = main_object.project.flags.where("flag = ? AND repo IS NULL AND architecture_id = ?", flag, architecture_id).first unless all_flag || arch_flag
       all_flag = main_object.project.flags.where("flag = ? AND repo IS NULL AND architecture_id IS NULL", flag).first unless all_flag
-      repo_flag = main_object.project.flags.where("flag = ? AND repo = ? AND architecture_id IS NULL", flag, repo).first unless repo_flag
-      arch_flag = main_object.project.flags.where("flag = ?
-                                                   AND repo IS NULL
-                                                   AND architecture_id = ?", flag, architecture_id).first unless arch_flag
-      same_flag = main_object.project.flags.where("flag = ?
-                                                   AND repo = ?
-                                                   AND architecture_id = ?", flag, repo, architecture_id).first
     end
 
     return same_flag.status if same_flag