Rework repository mover

Author: root

Diff for: app/controllers/repository_git_extras_controller.rb

@@ -18,7 +18,6 @@ def update
   end
 
 
-<<<<<<< HEAD
   def sort_urls
     @git_extra = @repository.extra
     if request.post?
@@ -32,16 +31,11 @@ def sort_urls
 
 
   def move
-    @projects = Project.all
-    @projects.delete(@project)
-    @move_repository_form = RepositoryMover.new()
+    @move_repository_form = MoveRepositoryForm.new(@repository)
     if request.post?
-      @move_repository_form = RepositoryMover.new(params[:repository_mover].merge(repository_id: @repository.id))
-      if @move_repository_form.valid?
-        project = @move_repository_form.project
-        @repository.update_attribute(:project_id, project.id)
-        GitoliteAccessor.move_repository(@repository)
-        redirect_to settings_project_path(project, tab: 'repositories')
+      @move_repository_form = MoveRepositoryForm.new(@repository)
+      if @move_repository_form.submit(params[:repository_mover])
+        redirect_to settings_project_path(@repository.project, tab: 'repositories')
       end
     end
   end

Diff for: app/forms/base_form.rb

@@ -0,0 +1,28 @@
+module BaseForm
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
+  end
+
+
+  def persisted?
+    false
+  end
+
+
+  def submit(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+    if valid?
+      valid_form_submitted
+      true
+    else
+      false
+    end
+  end
+
+end

Diff for: app/forms/move_repository_form.rb

@@ -0,0 +1,49 @@
+class MoveRepositoryForm
+  unloadable
+
+  include BaseForm
+
+  attr_reader   :repository
+  attr_accessor :project_id
+
+  validates_presence_of :project_id
+  validate :repository_is_movable
+  validate :target_project
+  validate :repository_uniqueness
+
+
+  def initialize(repository)
+    @repository = repository
+  end
+
+
+  def project
+    @project ||= Project.find_by_id(project_id)
+  end
+
+
+  def valid_form_submitted
+    repository.update_attribute(:project_id, project.id)
+    GitoliteAccessor.move_repository(repository)
+  end
+
+
+  private
+
+
+    def repository_is_movable
+      errors.add(:base, :identifier_empty) if !repository.movable?
+    end
+
+
+    def target_project
+      errors.add(:base, :wrong_target_project) if repository.project == project
+    end
+
+
+    def repository_uniqueness
+      new_repo = project.repositories.find_by_identifier(repository.identifier)
+      errors.add(:base, :identifier_taken) if !new_repo.nil?
+    end
+
+end

Diff for: app/helpers/extend_repositories_helper.rb

@@ -55,4 +55,9 @@ def label_for_url_type(url_type)
     RepositoryGitExtra::URLS_ICONS[url_type][:label]
   end
 
+
+  def render_options_for_move_repo_select_box(project)
+    projects = Project.active
+    project_tree_options_for_select(projects, selected: project) if projects.any?
+  end
 end

Diff for: app/models/concerns/gitolitable/permissions.rb

@@ -80,5 +80,10 @@ def deletable?
       RedmineGitHosting::Config.delete_git_repositories?
     end
 
+
+    def movable?
+      !identifier.nil? && !identifier.empty?
+    end
+
   end
 end

Diff for: app/models/repository_mover.rb

@@ -45,7 +45,7 @@
                                          class: 'icon icon-edit'
 
               = link_to l(:button_move), move_repository_git_extras_path(repository),
-                                         class: 'icon icon-move'
+                                         class: 'icon icon-move' if repository.is_a?(Repository::Xitolite) && repository.movable?
 
               = delete_link repository_path(repository)
 

Diff for: app/views/projects/settings/_repositories.html.haml

@@ -8,7 +8,7 @@
 
     .flash-messages= error_messages_for 'move_repository_form'
 
-    %p= f.select :project_id, options_from_collection_for_select(@projects, :id, :name), prompt: 'Select a project'
+    %p= f.select :project_id, render_options_for_move_repo_select_box(@project), prompt: 'Select a project'
     %p
       = f.submit l(:button_move)
       = link_to l(:button_cancel), settings_project_path(@project, tab: 'repositories')

Diff for: app/views/repository_git_extras/move.html.haml

@@ -4,8 +4,9 @@ fr:
   activemodel:
     errors:
       models:
-        repository_mover:
+        move_repository_form:
           attributes:
             base:
               identifier_empty: Ne peut déplacer un dépôt avec un identifiant vide
               identifier_taken: Identifiant de dépôt déjà utilisé par le nouveau projet
+              wrong_target_project: Le projet de destination est identique au projet source

Diff for: config/locales/models/repository_mover/fr.yml renamed to config/locales/forms/move_repository/fr.yml

@@ -6,6 +6,7 @@ module ExtraLoading
 
     # Load Forms and Concerns objects
     [
+      Rails.root.join('plugins', 'redmine_git_hosting', 'app', 'forms'),
       Rails.root.join('plugins', 'redmine_git_hosting', 'app', 'models', 'concerns'),
       Rails.root.join('plugins', 'redmine_git_hosting', 'app', 'presenters'),
       Rails.root.join('plugins', 'redmine_git_hosting', 'app', 'reports'),