From 25180d09091e0aab52c03e539674319024d27e53 Mon Sep 17 00:00:00 2001 From: flozzone Date: Fri, 8 May 2020 18:22:21 +0200 Subject: [PATCH 1/2] Make repository clone path configurable via settings. Signed-off-by: flozzone --- app/models/repository/git_remote.rb | 9 +++++---- app/views/settings/_git_remote_settings.html.erb | 7 +++++++ config/locales/en.yml | 4 ++++ init.rb | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 app/views/settings/_git_remote_settings.html.erb diff --git a/app/models/repository/git_remote.rb b/app/models/repository/git_remote.rb index a16cf30..7d4f84e 100644 --- a/app/models/repository/git_remote.rb +++ b/app/models/repository/git_remote.rb @@ -6,9 +6,6 @@ require_dependency 'redmine_git_remote/poor_mans_capture3' class Repository::GitRemote < Repository::Git - PLUGIN_ROOT = Pathname.new(__FILE__).join("../../../..").realpath.to_s - PATH_PREFIX = PLUGIN_ROOT + "/repos/" - before_validation :initialize_clone safe_attributes 'extra_info', :if => lambda {|repository, _user| repository.new_record?} @@ -81,7 +78,11 @@ class Repository::GitRemote < Repository::Git p = parse(attributes["extra_info"]["extra_clone_url"]) self.identifier = p[:identifier] if identifier.empty? - self.url = PATH_PREFIX + p[:path] if url.empty? + + base_path = Setting.plugin_redmine_git_remote['git_remote_repo_clone_path'] + base_path = base_path + "/" unless base_path.end_with?("/") + + self.url = base_path + p[:path] if url.empty? err = ensure_possibly_empty_clone_exists errors.add :extra_clone_url, err if err diff --git a/app/views/settings/_git_remote_settings.html.erb b/app/views/settings/_git_remote_settings.html.erb new file mode 100644 index 0000000..0251058 --- /dev/null +++ b/app/views/settings/_git_remote_settings.html.erb @@ -0,0 +1,7 @@ +

<%= t('config.title') %>

+ +

+ + <%= text_field_tag 'settings[git_remote_repo_clone_path]', @settings['git_remote_repo_clone_path'], :size => '60' %> + <%= t('config.clone_path_hint') %> +

diff --git a/config/locales/en.yml b/config/locales/en.yml index 27c8435..ab37d47 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,3 +2,7 @@ en: field_extra_clone_url: Clone URL text_git_remote_url_note: The URL to clone from. text_git_remote_path_note: The absolute filesystem path to clone to. Leave blank to auto-populate from URL. + config: + title: Git Remote Settings + repo_clone_path: Repository clone path + clone_path_hint: Path where repository is cloned. Relative to plugin directory. diff --git a/init.rb b/init.rb index badbe78..2033efc 100644 --- a/init.rb +++ b/init.rb @@ -9,4 +9,8 @@ Redmine::Plugin.register :redmine_git_remote do url 'https://github.com/dergachev/redmine_git_remote' description 'Automatically clone and fetch remote git repositories' version '0.0.1' + + settings :default => { + 'git_remote_repo_clone_path' => Pathname.new(__FILE__).join("../").realpath.to_s + "/repos", + }, :partial => 'settings/git_remote_settings' end From 18f167930b1f37e2a2c65fe6ee65e8eaa4210d22 Mon Sep 17 00:00:00 2001 From: flozzone Date: Fri, 8 May 2020 18:26:21 +0200 Subject: [PATCH 2/2] Increase version to 0.0.2 Git Tag says 0.0.2 but version in plugin is still set to 0.0.2 Signed-off-by: flozzone --- init.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.rb b/init.rb index 2033efc..8906267 100644 --- a/init.rb +++ b/init.rb @@ -8,7 +8,7 @@ Redmine::Plugin.register :redmine_git_remote do author 'Alex Dergachev' url 'https://github.com/dergachev/redmine_git_remote' description 'Automatically clone and fetch remote git repositories' - version '0.0.1' + version '0.0.2' settings :default => { 'git_remote_repo_clone_path' => Pathname.new(__FILE__).join("../").realpath.to_s + "/repos",