[webui] Remove has_comment from controllers and routes

openSUSE · Dec 28, 2016 · e450ae1 · e450ae1
1 parent f547944
commit e450ae1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 34 deletions.
diff --git a/src/api/app/controllers/webui/package_controller.rb b/src/api/app/controllers/webui/package_controller.rb
@@ -3,7 +3,6 @@
 
 class Webui::PackageController < Webui::WebuiController
   require_dependency 'opensuse/validator'
-  include Webui::HasComments
   include ParsePackageDiff
   include Webui::PackageHelper
   include Escaper
@@ -31,8 +30,7 @@ class Webui::PackageController < Webui::WebuiController
                                          :save_group, :remove_role, :view_file,
                                          :abort_build, :trigger_rebuild, :trigger_services,
                                          :wipe_binaries, :buildresult, :rpmlint_result, :rpmlint_log, :meta,
-                                         :attributes, :edit, :import_spec, :files, :comments, :users,
-                                         :save_comment]
+                                         :attributes, :edit, :import_spec, :files, :comments, :users]
 
   # make sure it's after the require_, it requires both
   before_action :require_login, except: [:show, :linking_packages, :linking_packages, :dependency,

diff --git a/src/api/app/controllers/webui/project_controller.rb b/src/api/app/controllers/webui/project_controller.rb
@@ -1,6 +1,5 @@
 class Webui::ProjectController < Webui::WebuiController
   require_dependency 'opensuse/validator'
-  include Webui::HasComments
   include Webui::RequestHelper
   include Webui::ProjectHelper
   include Webui::LoadBuildresults
@@ -18,7 +17,7 @@ class Webui::ProjectController < Webui::WebuiController
                                      :show, :linking_projects, :add_person, :add_group, :buildresult, :delete_dialog,
                                      :destroy, :remove_path_from_target, :rebuild_time, :packages_simple,
                                      :requests, :save, :monitor, :toggle_watch, :meta,
-                                     :prjconf, :edit, :save_comment, :edit_comment,
+                                     :prjconf, :edit, :edit_comment,
                                      :status, :maintained_projects,
                                      :add_maintained_project_dialog, :add_maintained_project, :remove_maintained_project,
                                      :maintenance_incidents, :unlock_dialog, :unlock, :save_person, :save_group, :remove_role,

diff --git a/src/api/app/controllers/webui/request_controller.rb b/src/api/app/controllers/webui/request_controller.rb
@@ -1,8 +1,6 @@
 require 'base64'
 
 class Webui::RequestController < Webui::WebuiController
-  include Webui::HasComments
-
   helper 'webui/comment'
   helper 'webui/package'
 

diff --git a/src/api/app/helpers/webui/comment_helper.rb b/src/api/app/helpers/webui/comment_helper.rb
@@ -2,8 +2,8 @@ module Webui::CommentHelper
   # This could also be solved with
   # http://apidock.com/rails/ActiveRecord/NestedAttributes/ClassMethods/accepts_nested_attributes_for
   def save_comment_form
-    opts = {action: 'save_comment'}
-    opts[:controller] = params[:controller]
+    opts = {action: 'create'}
+    opts[:controller] = :comments
     opts[:project] = @project.name if @project
     opts[:package] = @package.to_param if @package
     opts[:id] = @id if @id

diff --git a/src/api/app/mixins/webui/has_comments.rb b/src/api/app/mixins/webui/has_comments.rb
diff --git a/src/api/config/routes.rb b/src/api/config/routes.rb
@@ -151,7 +151,6 @@ def self.public_or_about_path?(request)
       get 'package/import_spec/:project/:package' => :import_spec, constraints: cons
       # compat route
       get 'package/files/:project/:package' => :show, constraints: cons
-      post 'package/comments/:project/:package' => :save_comment, constraints: cons
     end
 
     controller 'webui/patchinfo' do
@@ -251,7 +250,6 @@ def self.public_or_about_path?(request)
       get 'project/list_incidents/:project' => :list_incidents, constraints: cons
       get 'project/unlock_dialog' => :unlock_dialog
       post 'project/unlock' => :unlock
-      post 'project/comments/:project' => :save_comment, constraints: cons, as: 'save_project_comment'
     end
 
     controller 'webui/request' do
@@ -274,7 +272,6 @@ def self.public_or_about_path?(request)
       post 'request/change_devel_request' => :change_devel_request
       get 'request/set_incident_dialog' => :set_incident_dialog
       post 'request/set_incident' => :set_incident
-      post 'request/comments/:number' => :save_comment
     end
 
     controller 'webui/search' do
@@ -335,9 +332,7 @@ def self.public_or_about_path?(request)
       get 'group/tokens' => :tokens
     end
 
-    namespace :webui do
-      resource :comment, only: [:destroy]
-    end
+    resources :comments, constraints: cons, only: [:create, :destroy], controller: 'webui/comments'
 
     ### /apidocs
     get 'apidocs(/index)' => 'webui/apidocs#index'