Add feature #465

Author: root

Diff for: app/services/gitolite_accessor.rb

@@ -91,15 +91,15 @@ def flush_settings_cache
     end
 
 
-    def enable_readme_creation
-      logger.info('Enable README creation for repositories')
-      resync_gitolite(:enable_readme_creation, 'enable_readme_creation')
+    def enable_rw_access
+      logger.info('Enable RW access on all Gitolite repositories')
+      resync_gitolite(:enable_rw_access, 'enable_rw_access')
     end
 
 
-    def disable_readme_creation
-      logger.info('Disable README creation for repositories')
-      resync_gitolite(:disable_readme_creation, 'disable_readme_creation')
+    def disable_rw_access
+      logger.info('Disable RW access on all Gitolite repositories')
+      resync_gitolite(:disable_rw_access, 'disable_rw_access')
     end
 
 

Diff for: app/use_cases/apply_settings.rb

@@ -44,7 +44,7 @@ def apply_settings
       do_regenerate_ssh_keys
       do_flush_cache
       do_delete_trash_repo
-      do_enable_readme_creation
+      do_add_redmine_rw_access
     end
 
 
@@ -149,8 +149,8 @@ def do_delete_trash_repo
     end
 
 
-    def do_enable_readme_creation
-      valuehash[:init_repositories_on_create] == 'true' ? GitoliteAccessor.enable_readme_creation : GitoliteAccessor.disable_readme_creation
+    def do_add_redmine_rw_access
+      valuehash[:redmine_has_rw_access_on_all_repos] == 'true' ? GitoliteAccessor.enable_rw_access : GitoliteAccessor.disable_rw_access
     end
 
 end

Diff for: app/views/settings/redmine_git_hosting/_redmine_config.html.haml

@@ -1,11 +1,18 @@
 / Redmine Config
-- all_projects_use_git        = RedmineGitHosting::Config.get_setting(:all_projects_use_git, true)
-- init_repositories_on_create = RedmineGitHosting::Config.get_setting(:init_repositories_on_create, true)
-- delete_git_repositories     = RedmineGitHosting::Config.get_setting(:delete_git_repositories, true)
-- hierarchical_organisation   = RedmineGitHosting::Config.get_setting(:hierarchical_organisation, true)
+- redmine_has_rw_access_on_all_repos = RedmineGitHosting::Config.get_setting(:redmine_has_rw_access_on_all_repos, true)
+- all_projects_use_git               = RedmineGitHosting::Config.get_setting(:all_projects_use_git, true)
+- init_repositories_on_create        = RedmineGitHosting::Config.get_setting(:init_repositories_on_create, true)
+- delete_git_repositories            = RedmineGitHosting::Config.get_setting(:delete_git_repositories, true)
+- hierarchical_organisation          = RedmineGitHosting::Config.get_setting(:hierarchical_organisation, true)
 
 %h3= l(:label_redmine_config)
 
+%p
+  %label= l(:label_redmine_has_rw_access_on_all_repos)
+  = bootstrap_switch_tag do
+    = hidden_field_tag 'settings[redmine_has_rw_access_on_all_repos]', 'false'
+    = check_box_tag 'settings[redmine_has_rw_access_on_all_repos]', redmine_has_rw_access_on_all_repos, redmine_has_rw_access_on_all_repos
+
 %p
   %label= l(:label_all_projects_use_git)
   = bootstrap_switch_tag do

Diff for: config/locales/settings/en.yml

@@ -117,6 +117,7 @@ en:
   label_tab_redmine: Redmine
   label_redmine_config: Redmine Configuration
 
+  label_redmine_has_rw_access_on_all_repos: Redmine has RW access on all Gitolite repositories
   label_all_projects_use_git: Automatically initialize Git repositories for new projects?
   label_delete_git_repositories: Delete Git repository when project deleted?<br/>(will be place in recycle bin)
   label_init_repositories_on_create: Automatically initialize Git repositories with a README file (à la Github)

Diff for: config/locales/settings/fr.yml

@@ -117,6 +117,7 @@ fr:
   label_tab_redmine: Redmine
   label_redmine_config: Configuration de Redmine
 
+  label_redmine_has_rw_access_on_all_repos: Redmine a accès en lecture/écriture à tous les dépôts Gitolite
   label_all_projects_use_git: Créer automatiquement un dépôt Git pour les nouveaux projets
   label_delete_git_repositories: Effacer les dépôts Git d'un projet quand celui-ci est effacé?<br/>(seront mis dans la corbeille)
   label_init_repositories_on_create: Initialiser automatiquement les dépôts Git avec un fichier README (à la Github)

Diff for: init.rb

@@ -62,9 +62,10 @@
       :gitolite_http_by_default         => '1',
 
       # Redmine Config
-      :all_projects_use_git             => 'false',
-      :init_repositories_on_create      => 'false',
-      :delete_git_repositories          => 'true',
+      :redmine_has_rw_access_on_all_repos => 'true',
+      :all_projects_use_git               => 'false',
+      :init_repositories_on_create        => 'false',
+      :delete_git_repositories            => 'true',
 
       # This params work together!
       # When hierarchical_organisation = true, unique_repo_identifier MUST be false

Diff for: lib/redmine_git_hosting/gitolite_wrapper/global.rb

@@ -2,30 +2,30 @@ module RedmineGitHosting
   module GitoliteWrapper
     class Global < Admin
 
-      def enable_readme_creation
+      def enable_rw_access
         if all_repository_config.nil?
           admin.transaction do
-            gitolite_config.add_repo(create_readme_config)
-            gitolite_admin_repo_commit("Enable README file creation for repositories")
+            gitolite_config.add_repo(rw_access_config)
+            gitolite_admin_repo_commit("Enable RW access on all Gitolite repositories")
           end
         else
           logger.info("'@all' repository already configured, check for RedmineGitHosting key presence")
           admin.transaction do
             add_redmine_key
-            gitolite_admin_repo_commit("Enable README file creation for repositories")
+            gitolite_admin_repo_commit("Enable RW access on all Gitolite repositories")
           end
         end
       end
 
 
-      def disable_readme_creation
+      def disable_rw_access
         if all_repository_config.nil?
-          logger.info('README file creation already disabled.')
+          logger.info('RW access on all Gitolite repositories already disabled.')
           return
         else
           admin.transaction do
             remove_redmine_key
-            gitolite_admin_repo_commit("Disable README file creation for repositories")
+            gitolite_admin_repo_commit("Disable RW access on all Gitolite repositories")
           end
         end
       end
@@ -49,14 +49,14 @@ def all_repository_config
         end
 
 
-        def create_readme_config
+        def rw_access_config
           repo_conf = ::Gitolite::Config::Repo.new(all_repository)
-          repo_conf.permissions = create_readme_perms
+          repo_conf.permissions = rw_access_perms
           repo_conf
         end
 
 
-        def create_readme_perms
+        def rw_access_perms
           permissions = {}
           permissions['RW+'] = {}
           permissions['RW+'][''] = [redmine_gitolite_key]
@@ -97,7 +97,7 @@ def add_redmine_key
           # If not create the RW+ group and add the key
           if perms.empty?
             logger.info("No permissions set for '@all' repository, add RedmineGitHosting key")
-            repo_conf.permissions = create_readme_perms
+            repo_conf.permissions = rw_access_perms
             return
           end