From 88135ddd3eb1deadf34afa5e96d7ada8f05b0d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?=
 <ammartinez@suse.de>
Date: Mon, 28 Jan 2019 13:28:42 +0100
Subject: [PATCH] Get rid of Project#api_obj

It just returns itself.
---
 src/api/app/controllers/webui/package_controller.rb         | 3 +--
 src/api/app/controllers/webui/project_controller.rb         | 2 +-
 src/api/app/helpers/webui/project_helper.rb                 | 6 +++---
 src/api/app/models/project.rb                               | 4 ----
 .../views/webui2/webui/project/_status_comment.html.haml    | 4 ++--
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/api/app/controllers/webui/package_controller.rb b/src/api/app/controllers/webui/package_controller.rb
index 64d06c54f43..39da4d9a0a1 100644
--- a/src/api/app/controllers/webui/package_controller.rb
+++ b/src/api/app/controllers/webui/package_controller.rb
@@ -65,7 +65,7 @@ def show
     @srcmd5 = params[:srcmd5]
     @revision_parameter = params[:rev]
 
-    @bugowners_mail = (@package.bugowner_emails + @project.api_obj.bugowner_emails).uniq
+    @bugowners_mail = (@package.bugowner_emails + @project.bugowner_emails).uniq
     @revision = params[:rev]
     @failures = 0
 
@@ -540,7 +540,6 @@ def check_package_name_for_new
       redirect_to controller: :project, action: :new_package, project: @project
       return false
     end
-    @project = @project.api_obj
     unless User.current.can_create_package_in?(@project)
       flash[:error] = "You can't create packages in #{@project.name}"
       redirect_to controller: :project, action: :new_package, project: @project
diff --git a/src/api/app/controllers/webui/project_controller.rb b/src/api/app/controllers/webui/project_controller.rb
index 1eabe53fffa..3e6f4b966eb 100644
--- a/src/api/app/controllers/webui/project_controller.rb
+++ b/src/api/app/controllers/webui/project_controller.rb
@@ -744,7 +744,7 @@ def monitor_set_filter(defaults)
     @avail_arch_values = []
     @avail_repo_values = []
 
-    @project.api_obj.repositories.each do |r|
+    @project.repositories.each do |r|
       @avail_repo_values << r.name
       @avail_arch_values << r.architectures.pluck(:name)
     end
diff --git a/src/api/app/helpers/webui/project_helper.rb b/src/api/app/helpers/webui/project_helper.rb
index 4889721f911..fa77f9bde54 100644
--- a/src/api/app/helpers/webui/project_helper.rb
+++ b/src/api/app/helpers/webui/project_helper.rb
@@ -21,14 +21,14 @@ def show_status_comment(comment, package, firstfail, comments_to_clear)
       # TODO: Port _to_remote helpers to jQuery
       status_comment_html = ERB::Util.h(comment)
       if !firstfail
-        if User.current.can_modify?(@project.api_obj)
+        if User.current.can_modify?(@project)
           status_comment_html += ' '.html_safe + link_to(image_tag('comment_delete.png', size: '16x16', alt: 'Clear'),
                                                          { action: :clear_failed_comment, project: @project,
                                                            package: package, update: valid_xml_id("comment_#{package}") },
                                                          remote: true)
           comments_to_clear << package
         end
-      elsif User.current.can_modify?(@project.api_obj)
+      elsif User.current.can_modify?(@project)
         status_comment_html += ' '.html_safe
         status_comment_html += link_to(image_tag('comment_edit.png', alt: 'Edit'),
                                        { action: 'edit_comment_form', comment: comment,
@@ -37,7 +37,7 @@ def show_status_comment(comment, package, firstfail, comments_to_clear)
                                        remote: true)
       end
     elsif firstfail
-      if User.current.can_modify?(@project.api_obj)
+      if User.current.can_modify?(@project)
         status_comment_html += " <span class='unknown_failure'>Unknown build failure ".html_safe +
                                link_to(image_tag('comment_edit.png', size: '16x16', alt: 'Edit'),
                                        { action: 'edit_comment_form', comment: '', package: package,
diff --git a/src/api/app/models/project.rb b/src/api/app/models/project.rb
index 204c0da07f3..16fed0ead7b 100644
--- a/src/api/app/models/project.rb
+++ b/src/api/app/models/project.rb
@@ -1587,10 +1587,6 @@ def has_remote_repositories?
     DownloadRepository.where(repository_id: repositories.select(:id)).exists?
   end
 
-  def api_obj
-    self
-  end
-
   def to_s
     name
   end
diff --git a/src/api/app/views/webui2/webui/project/_status_comment.html.haml b/src/api/app/views/webui2/webui/project/_status_comment.html.haml
index 4094edf4de1..3a902288988 100644
--- a/src/api/app/views/webui2/webui/project/_status_comment.html.haml
+++ b/src/api/app/views/webui2/webui/project/_status_comment.html.haml
@@ -1,6 +1,6 @@
 - if comment
   = h(comment)
-  - if User.current.can_modify?(project.api_obj)
+  - if User.current.can_modify?(project)
     - if editable
       = link_to(edit_comment_form_path(project: project, package: package_name, comment: comment), remote: true, title: 'Edit Comment') do
         %i.fas.fa-edit.text-secondary
@@ -10,6 +10,6 @@
 - elsif editable
   %span.unknown_failure
     Unknown build failure
-    - if User.current.can_modify?(project.api_obj)
+    - if User.current.can_modify?(project)
       = link_to(edit_comment_form_path(project: project, package: package_name, comment: ''), remote: true, title: 'Edit Comment') do
         %i.fas.fa-edit.text-secondary