Skip to content

Commit 77bdd3b

Browse files
author
root
committed
Fix #413
1 parent 57eaa43 commit 77bdd3b

File tree

3 files changed

+28
-25
lines changed

3 files changed

+28
-25
lines changed

Diff for: app/views/common/_git_urls.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
#git_url_box= l(:label_repository_access_not_configured)
2020

2121
:javascript
22-
$(document).ready(function() { setFirstGitUrl('.git_url_list'); bindGitUrls('.git_url'); });
22+
$(document).ready(function() { setGitUrls('.git_url'); });

Diff for: app/views/repositories/git_instructions.html.haml

+1-19
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,4 @@
5555
= render 'common/git_urls', repository: @repository
5656

5757
:javascript
58-
$(document).ready(function() {
59-
var key = $('.git_url_list li').first().attr('id');
60-
var access = access_list[key];
61-
62-
$('.git_url_access').html(access.url);
63-
64-
$('.git_url_list li').on('click', function(){
65-
var key = $(this).attr('id');
66-
var access = access_list[key];
67-
68-
$('.git_url_access').html(access.url);
69-
70-
if (access.committer == true) {
71-
$('#repository_setup').show();
72-
} else {
73-
$('#repository_setup').hide();
74-
}
75-
});
76-
});
58+
$(document).ready(function() { setGitUrlsInstructions('.git_url'); });

Diff for: assets/javascripts/application.js

+26-5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ function trigger_mode_change(element) {
3737
}
3838
}
3939

40+
// GIT URLS
4041
function updateUrl(element) {
4142
var url = $(element).data('url');
4243
var target = $(element).data('target');
@@ -47,21 +48,41 @@ function updateUrl(element) {
4748
$(element).addClass('selected');
4849
}
4950

50-
function setFirstGitUrl(elements) {
51+
function setGitUrls(elements) {
5152
$(elements).each(function(index, element){
52-
var first_url = $(element).children().first();
53-
updateUrl(first_url);
53+
if (index == 0){
54+
updateUrl(element);
55+
};
56+
$(element).on('click', function(){
57+
updateUrl($(this));
58+
});
5459
});
5560
}
5661

57-
function bindGitUrls(elements) {
62+
// GIT INSTRUCTIONS
63+
function updateInstructionUrl(element) {
64+
var url = $(element).data('url');
65+
var committer = $(element).data('committer');
66+
$('.git_url_access').html(url);
67+
if (committer == 'RW') {
68+
$('#repository_setup').show();
69+
} else {
70+
$('#repository_setup').hide();
71+
}
72+
}
73+
74+
function setGitUrlsInstructions(elements) {
5875
$(elements).each(function(index, element){
76+
if (index == 0){
77+
updateInstructionUrl(element);
78+
};
5979
$(element).on('click', function(){
60-
updateUrl($(this));
80+
updateInstructionUrl($(this));
6181
});
6282
});
6383
}
6484

85+
// REPOSITORY EDIT
6586
function setRepositoryActiveTab(current_tab) {
6687
var all_tabs = $("#repository-tabs li");
6788
var active_tab = '';

0 commit comments

Comments
 (0)