Skip to content

updated location of tasks #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: 2.0-migration
Choose a base branch
from
Open

updated location of tasks #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0fa3fa5
updated location of tasks
phpboyscout Sep 17, 2012
7fae192
added string to array conversion on removal of user keys
phpboyscout Sep 18, 2012
418a6e7
updated settings fields as it kept adding the relative ./ to the values
phpboyscout Sep 18, 2012
6ee8d06
updated en.yml to remove html
phpboyscout Sep 18, 2012
2d5bca0
updated views for html rendering
phpboyscout Sep 18, 2012
95adbdd
updated views for html rendering
phpboyscout Sep 18, 2012
6d23afb
updated en.yml
phpboyscout Sep 18, 2012
19585c3
updated settings access view
phpboyscout Sep 18, 2012
072d6e3
updated settings access view
phpboyscout Sep 18, 2012
3c83f37
updated settings access view
phpboyscout Sep 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions app/views/settings/_display_access.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@
<%= l(:display_access_setup) %>:
<p>
<label>Repo Storage:</label>
<%= "~#{@settings['gitUser']}/#{@settings['gitRepositoryBasePath']}#{@settings['gitRedmineSubdir']}<em>#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git</em>"
%>
<%= "~#{@settings['gitUser']}/#{@settings['gitRepositoryBasePath']}#{@settings['gitRedmineSubdir']}" %><em><%="#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git" %></em>
<br/>
<label><%= l(:label_ssh_access)%>:</label>
<% gitSHP = Setting.plugin_redmine_git_hosting['gitServer'].match(/:\d+$/) %>
<%= "#{gitSHP ? 'ssh://' : ''}#{@settings['gitUser']}@#{@settings['gitServer']}#{gitSHP ? '/' : ':'}#{@settings['gitRedmineSubdir']}<em>#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git</em>"
%>
<%= "#{gitSHP ? 'ssh://' : ''}#{@settings['gitUser']}@#{@settings['gitServer']}#{gitSHP ? '/' : ':'}#{@settings['gitRedmineSubdir']}" %><em><%="#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git" %></em>
<br/>
<label><%= l(:label_http_access)%>:</label>
<%= "http://<em>redmine-user</em>@#{GitHosting.my_root_url}/#{GitHosting.http_server_subdir}<em>#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git</em>"
%>
http://<em>redmine-user</em><%="@#{GitHosting.my_root_url}/#{GitHosting.http_server_subdir}"%><em><?="#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git" %></em>
</p>
<%= l(:display_access_emphasis) %>
<%= @settings['gitRepositoryHierarchy']=='true' ? l(:display_access_hierarchical) : l(:display_access_flat) %>
Expand Down
365 changes: 183 additions & 182 deletions app/views/settings/_redmine_git_hosting.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,186 +3,187 @@
<%= render :partial => "display_access" %>
<br/>
<div class="tabular settings">
<h3><%= l(:label_basic_settings)%></h3>
<p>
<label><%= l(:label_git_lock_wait_time)%></label>
<%= text_field_tag("settings[gitLockWaitTime]", @settings['gitLockWaitTime'], :size => 10) %>

</p>
<p>
<label><%= l(:label_tmp_data_dir) %></label>
<%= text_field_tag("settings[gitTempDataDir]", @settings['gitTempDataDir'], :size => 60) %>

</p>
<p>
<label><%= l(:label_script_dir) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? :reset %></label>
<% stripped = (@settings['gitScriptDir'] || "").lstrip.rstrip
norm = File.expand_path(stripped,"/")
reldir = ((stripped[0,1] != "/")?".":"") + norm + ((norm[-1,1] != "/")?"/":"")%>
<%= text_field_tag("settings[gitScriptDir]", reldir, :size => 60) %>

</p>
<p>
<label><%= l(:label_git_user) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? :reset %></label>
<%= text_field_tag("settings[gitUser]", @settings['gitUser'].split(/[\r\n\t ,;]+/).join("\n"), :size => 60) %>

</p>

<p>
<label><%= l(:label_gitolite_identity_file) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? %></label>
<%= text_field_tag("settings[gitoliteIdentityFile]", @settings['gitoliteIdentityFile'], :size => 60) %>

</p>
<p>
<label><%= l(:label_gitolite_identity_public_key_file) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? %></label>
<%= text_field_tag("settings[gitoliteIdentityPublicKeyFile]", @settings['gitoliteIdentityPublicKeyFile'], :size => 60) %>

</p>



<h3><%= l(:label_gitolite_repository_settings)%></h3>
<p>
<label><%= l(:label_git_repository_base_path)%></label>
<%= text_field_tag("settings[gitRepositoryBasePath]", "./#{@settings['gitRepositoryBasePath']}", :size => 60) %>

</p>
<p>
<label><%= l(:label_git_redmine_subdir)%></label>
<%= text_field_tag("settings[gitRedmineSubdir]", "./#{@settings['gitRedmineSubdir']}", :size => 60) %>

</p>
<p>
<label><%= l(:label_git_repository_hierarchy)%></label>
<%= select_tag("settings[gitRepositoryHierarchy]", options_for_select([[l(:label_hierarchical), 'true'], [l(:label_flat), 'false']], @settings['gitRepositoryHierarchy'])) %>

</p>
<p>
<label><%= l(:label_all_git)%></label>
<%= select_tag("settings[allProjectsUseGit]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['allProjectsUseGit'])) %>

</p>
<p>
<label><%= l(:label_default_git_daemon) %></label>
<%= select_tag("settings[gitDaemonDefault]", options_for_select([ [l(:label_disabled), "0"], [l(:label_enabled), "1"]], @settings['gitDaemonDefault']))%>

</p>
<p>
<label><%= l(:label_default_smart_http)%></label>
<%= select_tag("settings[gitHttpDefault]", options_for_select([ [l(:label_disabled), "0"], [l(:label_https_only), "1"], [l(:label_https_and_http), "2"] ], @settings['gitHttpDefault'])) %>

</p>
<p>
<label><%= l(:label_default_notify_cia) %></label>
<%= select_tag("settings[gitNotifyCIADefault]", options_for_select([ [l(:label_disabled), "0"], [l(:label_enabled), "1"]], @settings['gitNotifyCIADefault']))%>

</p>
<p>
<label><%= l(:label_delete_git_repositories)%></label>
<%= select_tag("settings[deleteGitRepositories]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['deleteGitRepositories'])) %>

</p>
<p>
<label><%= l(:label_git_recycle_base_path)%></label>
<%= text_field_tag("settings[gitRecycleBasePath]", "./#{@settings['gitRecycleBasePath']}", :size => 60) %>

</p>

<p>
<label><%= l(:label_git_recycle_expire_time)%></label>
<%= text_field_tag("settings[gitRecycleExpireTime]", @settings['gitRecycleExpireTime'], :size => 10) %>

</p>



<h3><%= l(:label_gitolite_access_URLs)%></h3>
<p>
<label><%= l(:label_git_server)%></label>
<%= text_field_tag("settings[gitServer]", @settings['gitServer'].split(/[\r\n\t ,;]+/).join("\n"), :size => 60) %>

</p>
<p>
<label><%= l(:label_http_server)%></label>
<%= text_field_tag("settings[httpServer]", @settings['httpServer'].split(/[\r\n\t ,;]+/).join("\n"), :size => 60) %>

</p>
<p>
<label><%= l(:label_http_server_subdir)%></label>
<%= text_field_tag("settings[httpServerSubdir]", "./#{@settings['httpServerSubdir']}", :size => 60) %>

</p>
<p>
<label><%= l(:label_git_show_urls)%></label>
<%= select_tag("settings[gitRepositoriesShowUrl]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitRepositoriesShowUrl'])) %>

</p>


<h3><%= l(:label_git_cache_parameters)%></h3>
<p>
<label><%= l(:label_git_cache_max_elements)%></label>
<%= text_field_tag("settings[gitCacheMaxElements]", @settings['gitCacheMaxElements'], :size => 20) %>

</p>
<p>
<label><%= l(:label_git_cache_max_size)%></label>
<%= text_field_tag("settings[gitCacheMaxSize]", @settings['gitCacheMaxSize'], :size => 20) %><em> MB</em>

</p>
<p>
<label><%= l(:label_git_cache_max_time)%></label>
<%= select_tag("settings[gitCacheMaxTime]", options_for_select([["until next commit", "-1"], ["1 minute or until next commit", "60"], ["15 minutes or until next commit", "900"], ["1 hour or until next commit", "3600"], ["1 day or until next commit", "86400"]], @settings['gitCacheMaxTime'] )) %>

</p>



<h3><%= l(:label_git_hook_header)%></h3>

<p>
<label><%= l(:label_git_hooks_are_asynchronous)%></label>
<%= select_tag("settings[gitHooksAreAsynchronous]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitHooksAreAsynchronous'])) %>

</p>

<p>
<label><%= l(:label_git_hook_debug)%></label>
<%= select_tag("settings[gitHooksDebug]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitHooksDebug'])) %>

</p>

<p>
<label><%= l(:label_git_force_hooks_update)%></label>
<%= select_tag("settings[gitForceHooksUpdate]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitForceHooksUpdate'])) %>
<br />
</p>

<p>
<label><%= l(:label_hook_installed)%></label>
<%= image_tag((GitHosting.check_hooks_installed==true ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %>
<em><%= (GitHosting.check_hooks_installed==true ? '' : GitHosting.check_hooks_installed) %></em>

</p>

<br/>

<h3><%= l(:label_permissions_header)%></h3>
<p>
<label><%= l(:label_sudo_git_to_web_user)%></label>
<%= image_tag((GitHosting.sudo_git_to_web_user==true ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %>
<em><%= (GitHosting.sudo_git_to_web_user==true ? '' : GitHosting.sudo_git_to_web_user) %></em>

</p>
<p>
<label><%= l(:label_sudo_web_to_git_user)%></label>
<%= image_tag((GitHosting.sudo_web_to_git_user==true ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %>
<em><%= (GitHosting.sudo_web_to_git_user==true ? '' : GitHosting.sudo_web_to_git_user) %></em>

</p>
<p>
<label>PATH Directories</label>
<%= (ENV['PATH']).gsub(/:/, "<br/>") %>
<br/>
</p>
<h3><%= l(:label_basic_settings)%></h3>
<p>
<label><%= l(:label_git_lock_wait_time)%></label>
<%= text_field_tag("settings[gitLockWaitTime]", @settings['gitLockWaitTime'], :size => 10) %>

</p>
<p>
<label><%= l(:label_tmp_data_dir) %></label>
<%= text_field_tag("settings[gitTempDataDir]", @settings['gitTempDataDir'], :size => 60) %>

</p>
<p>
<label><%= l(:label_script_dir) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? :reset %></label>
<% stripped = (@settings['gitScriptDir'] || "").lstrip.rstrip
# norm = File.expand_path(stripped,"/")
# reldir = ((stripped[0,1] != "/")?".":"") + norm + ((norm[-1,1] != "/")?"/":"")
reldir = stripped%>
<%= text_field_tag("settings[gitScriptDir]", reldir, :size => 60) %>

</p>
<p>
<label><%= l(:label_git_user) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? :reset %></label>
<%= text_field_tag("settings[gitUser]", @settings['gitUser'].split(/[\r\n\t ,;]+/).join("\n"), :size => 60) %>

</p>

<p>
<label><%= l(:label_gitolite_identity_file) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? %></label>
<%= text_field_tag("settings[gitoliteIdentityFile]", @settings['gitoliteIdentityFile'], :size => 60) %>

</p>
<p>
<label><%= l(:label_gitolite_identity_public_key_file) %><%= "<br/><em>[ #{l(:label_cannot_change_selinux)} ]</em>" if !GitHosting.bin_dir_writeable? %></label>
<%= text_field_tag("settings[gitoliteIdentityPublicKeyFile]", @settings['gitoliteIdentityPublicKeyFile'], :size => 60) %>

</p>



<h3><%= l(:label_gitolite_repository_settings)%></h3>
<p>
<label><%= l(:label_git_repository_base_path)%></label>
<%= text_field_tag("settings[gitRepositoryBasePath]", "#{@settings['gitRepositoryBasePath']}", :size => 60) %>

</p>
<p>
<label><%= l(:label_git_redmine_subdir)%></label>
<%= text_field_tag("settings[gitRedmineSubdir]", "#{@settings['gitRedmineSubdir']}", :size => 60) %>

</p>
<p>
<label><%= l(:label_git_repository_hierarchy)%></label>
<%= select_tag("settings[gitRepositoryHierarchy]", options_for_select([[l(:label_hierarchical), 'true'], [l(:label_flat), 'false']], @settings['gitRepositoryHierarchy'])) %>

</p>
<p>
<label><%= l(:label_all_git)%></label>
<%= select_tag("settings[allProjectsUseGit]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['allProjectsUseGit'])) %>

</p>
<p>
<label><%= l(:label_default_git_daemon) %></label>
<%= select_tag("settings[gitDaemonDefault]", options_for_select([ [l(:label_disabled), "0"], [l(:label_enabled), "1"]], @settings['gitDaemonDefault']))%>

</p>
<p>
<label><%= l(:label_default_smart_http)%></label>
<%= select_tag("settings[gitHttpDefault]", options_for_select([ [l(:label_disabled), "0"], [l(:label_https_only), "1"], [l(:label_https_and_http), "2"] ], @settings['gitHttpDefault'])) %>

</p>
<p>
<label><%= l(:label_default_notify_cia) %></label>
<%= select_tag("settings[gitNotifyCIADefault]", options_for_select([ [l(:label_disabled), "0"], [l(:label_enabled), "1"]], @settings['gitNotifyCIADefault']))%>

</p>
<p>
<label><%= l(:label_delete_git_repositories)%></label>
<%= select_tag("settings[deleteGitRepositories]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['deleteGitRepositories'])) %>

</p>
<p>
<label><%= l(:label_git_recycle_base_path)%></label>
<%= text_field_tag("settings[gitRecycleBasePath]", "#{@settings['gitRecycleBasePath']}", :size => 60) %>

</p>

<p>
<label><%= l(:label_git_recycle_expire_time)%></label>
<%= text_field_tag("settings[gitRecycleExpireTime]", @settings['gitRecycleExpireTime'], :size => 10) %>

</p>



<h3><%= l(:label_gitolite_access_URLs)%></h3>
<p>
<label><%= l(:label_git_server)%></label>
<%= text_field_tag("settings[gitServer]", @settings['gitServer'].split(/[\r\n\t ,;]+/).join("\n"), :size => 60) %>

</p>
<p>
<label><%= l(:label_http_server)%></label>
<%= text_field_tag("settings[httpServer]", @settings['httpServer'].split(/[\r\n\t ,;]+/).join("\n"), :size => 60) %>

</p>
<p>
<label><%= l(:label_http_server_subdir)%></label>
<%= text_field_tag("settings[httpServerSubdir]", "#{@settings['httpServerSubdir']}", :size => 60) %>

</p>
<p>
<label><%= l(:label_git_show_urls)%></label>
<%= select_tag("settings[gitRepositoriesShowUrl]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitRepositoriesShowUrl'])) %>

</p>


<h3><%= l(:label_git_cache_parameters)%></h3>
<p>
<label><%= l(:label_git_cache_max_elements)%></label>
<%= text_field_tag("settings[gitCacheMaxElements]", @settings['gitCacheMaxElements'], :size => 20) %>

</p>
<p>
<label><%= l(:label_git_cache_max_size)%></label>
<%= text_field_tag("settings[gitCacheMaxSize]", @settings['gitCacheMaxSize'], :size => 20) %><em> MB</em>

</p>
<p>
<label><%= l(:label_git_cache_max_time)%></label>
<%= select_tag("settings[gitCacheMaxTime]", options_for_select([["until next commit", "-1"], ["1 minute or until next commit", "60"], ["15 minutes or until next commit", "900"], ["1 hour or until next commit", "3600"], ["1 day or until next commit", "86400"]], @settings['gitCacheMaxTime'] )) %>

</p>



<h3><%= l(:label_git_hook_header)%></h3>

<p>
<label><%= l(:label_git_hooks_are_asynchronous)%></label>
<%= select_tag("settings[gitHooksAreAsynchronous]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitHooksAreAsynchronous'])) %>

</p>

<p>
<label><%= l(:label_git_hook_debug)%></label>
<%= select_tag("settings[gitHooksDebug]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitHooksDebug'])) %>

</p>

<p>
<label><%= l(:label_git_force_hooks_update)%></label>
<%= select_tag("settings[gitForceHooksUpdate]", options_for_select([[l(:label_enabled), 'true'], [l(:label_disabled), 'false']], @settings['gitForceHooksUpdate'])) %>
<br />
</p>

<p>
<label><%= l(:label_hook_installed)%></label>
<%= image_tag((GitHosting.check_hooks_installed==true ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %>
<em><%= (GitHosting.check_hooks_installed==true ? '' : GitHosting.check_hooks_installed) %></em>

</p>

<br/>

<h3><%= l(:label_permissions_header)%></h3>
<p>
<label><%= l(:label_sudo_git_to_web_user)%></label>
<%= image_tag((GitHosting.sudo_git_to_web_user==true ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %>
<em><%= (GitHosting.sudo_git_to_web_user==true ? '' : GitHosting.sudo_git_to_web_user) %></em>

</p>
<p>
<label><%= l(:label_sudo_web_to_git_user)%></label>
<%= image_tag((GitHosting.sudo_web_to_git_user==true ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %>
<em><%= (GitHosting.sudo_web_to_git_user==true ? '' : GitHosting.sudo_web_to_git_user) %></em>

</p>
<p>
<label>PATH Directories</label>
<%= (ENV['PATH']).gsub(/:/, "<br/>") %>
<br/>
</p>
</div>
Loading