Skip to content
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

Jump to bottom

Fixes to allow debian to be used on the prerelease site. #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes to allow debian to be used on the prerelease site. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion prerelease_website/ajax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def get_rdepends_by_level_and_excludes_ajax(
'err': err,
})
result = {}
result['rdepends'] = json.loads(out)
result['rdepends'] = json.loads(out.decode('utf-8'))
result['args_hash'] = args_hash
return json.dumps(result)

Expand Down
17 changes: 13 additions & 4 deletions prerelease_website/static/js/generate_command.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,23 @@ function load_repositories(ros_distro)
$.each(ubuntu_platforms, function (index, item) {
if ($.inArray(item, preferred_list) != -1)
{
$('#os_version').append('<option>' + item + '</option>');
$('#os_version').append('<option>ubuntu ' + item + '</option>');
}
});
$.each(ubuntu_platforms, function (index, item) {
if ($.inArray(item, preferred_list) == -1)
{
$('#os_version').append('<option>' + item + '</option>');
$('#os_version').append('<option>ubuntu ' + item + '</option>');
}
});
}
var debian_platforms = repo_list.release_platforms.debian;
if (debian_platforms)
{
$.each(debian_platforms, function (index, item) {
$('#os_version').append('<option>debian ' + item + '</option>');
});
}
$('#ros_buildfarm_url').placard('setValue', repo_list['build_farm_config_url']);
$('.loading-repositories').hide();
$('.selecting-repositories').show();
Expand Down Expand Up @@ -429,7 +436,7 @@ function edit_custom_repository_entry(num)
function get_custom_repository_entry(num)
{
var repo_help_msg = "";
repo_help_msg += "The reposiory name, vcs type, url, and version tuple " +
repo_help_msg += "The repository name, vcs type, url, and version tuple " +
"is used to fetch your custom repository.";
var e = '';
e += '<div class="repo-entry custom-repo-entry" id="repo_entry_' + num + '"';
Expand Down Expand Up @@ -724,6 +731,8 @@ function update_rdepends()

function update_command_output()
{
// The os_version variable comes back from the select looking like:
// 'ubuntu bionic'. We can use this directly below
var os_version = $('#os_version').val();
var selected_repos = get_selected_repos();
var package_specific_selected_repos = {};
Expand Down Expand Up @@ -762,7 +771,7 @@ function update_command_output()
'cd /tmp/prerelease_job</br>' +
'generate_prerelease_script.py \\<br/>' +
' ' + build_farm_config_url + ' \\<br/>' +
' ' + ros_distro + ' default ubuntu ' + os_version + ' amd64 \\<br/>';
' ' + ros_distro + ' default ' + os_version + ' amd64 \\<br/>';
if (non_custom_selected_repo_names.length > 0) {
msg += ' ' + non_custom_selected_repo_names.join(' ') + ' \\<br/>';
}
Expand Down
2 changes: 1 addition & 1 deletion prerelease_website/templates/generate_command.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h4>Some additional options:</h4>
</div>
</div>
<div class="form-group">
<label for="os_version">Version of Ubuntu to test in:</label>
<label for="os_version">Version of Platform to test in:</label>
<select id="os_version">
</select>
</div>
Expand Down