Skip to content

Commit a34684d

Browse files
author
root
committed
Fix #344
1 parent 42ba8ef commit a34684d

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

Diff for: app/use_cases/create_project_repository.rb

+11-13
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,17 @@ def call
1818

1919

2020
def create_project_repository
21-
if project.module_enabled?('repository') && RedmineGitHosting::Config.all_projects_use_git?
22-
# Create new repository
23-
repository = Repository.factory('Xitolite')
24-
repository.is_default = true
25-
repository.extra_info = {}
26-
repository.extra_info['extra_report_last_commit'] = '1'
27-
28-
# Save it to database
29-
project.repositories << repository
30-
31-
# Create it in Gitolite
32-
CreateRepository.new(repository, creation_options).call
33-
end
21+
# Create new repository
22+
repository = Repository.factory('Xitolite')
23+
repository.is_default = true
24+
repository.extra_info = {}
25+
repository.extra_info['extra_report_last_commit'] = '1'
26+
27+
# Save it to database
28+
project.repositories << repository
29+
30+
# Create it in Gitolite
31+
CreateRepository.new(repository, creation_options).call
3432
end
3533

3634

Diff for: config/locales/models/repository_xitolite/en.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ en:
1818
########### REPOSITORIES ###########
1919

2020
text_scm_command_not_available_git_hosting: SCM command is not available. Please check settings on the administration panel of Redmine Git Hosting plugin.
21+
error_xitolite_repositories_disabled: "Gitolite repositories are disabled, cannot create repository!"
2122

2223
# Edit Repository
2324
label_repository_options: Repository options

Diff for: config/locales/models/repository_xitolite/fr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ fr:
1818
########### REPOSITORIES ###########
1919

2020
text_scm_command_not_available_git_hosting: Ce SCM n'est pas disponible. Vérifier les paramètres dans la section administration du plugin Redmine Git Hosting.
21+
error_xitolite_repositories_disabled: "Les dépôts Gitolite sont désactivés, ne peut créer le dépôt!"
2122

2223
# Edit Repository
2324
label_repository_options: Options du dépôt

Diff for: lib/redmine_git_hosting/patches/projects_controller_patch.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,13 @@ def reopen_with_git_hosting(&block)
8585
# the repository in Gitolite.
8686
#
8787
def create_project_repository
88-
CreateProjectRepository.new(@project).call
88+
if @project.module_enabled?('repository') && RedmineGitHosting::Config.all_projects_use_git?
89+
if Setting.enabled_scm.include?('Xitolite')
90+
CreateProjectRepository.new(@project).call
91+
else
92+
flash[:error] = l(:error_xitolite_repositories_disabled)
93+
end
94+
end
8995
end
9096

9197

0 commit comments

Comments
 (0)