Commit c3b123df authored by Penom Nom's avatar Penom Nom
Browse files

Fix hidden analysis download bug (2).

parent 0e821ce8
......@@ -901,7 +901,7 @@ class tx_nG6_db {
}
else {
$where = 'fe_users.uid='.$user_id.' AND '.'tx_nG6_run_analyze.run_id='.$run_id.
' AND ((fe_rights.right_id<>2 AND tx_nG6_analyze.hidden=0) OR fe_rights.right_id=2)' ;
' AND ((fe_rights.right_id<>2 AND tx_nG6_analyze.hidden=0) OR fe_rights.right_id=2)' ;
}
// First select all analysis from the database
......
......@@ -184,8 +184,8 @@ $(function () {
buttons[$("#create_btn_label").val()] = function(){
$('.ui-dialog-buttonpane button:contains('+ $("#cancel_btn_label").val() +')').parent().hide();
// First built the correct url
var url_val = "index.php?eID=tx_nG6&type=download&data_folder=" + $("#data_folder").val() + "&user_directory=";
url_val += $("#user_directory_val").val() + "&user_login=" + $("#user_login_val").val() + "&user_pwd=" + escape($("#user_pwd_val").val());
var url_val = "index.php?eID=tx_nG6&type=download&data_folder=" + $("#data_folder").val() + "&user_directory=" + $("#user_directory_val").val() ;
url_val += "&user_id=" + $("#user_id").val() + "&user_login=" + $("#user_login_val").val() + "&user_pwd=" + escape($("#user_pwd_val").val());
url_val += "&format=" + $("input[type=radio][name=format]:checked").val() + "&ids=";
$(".jstree-checked > ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked").each(function(){
url_val += $(this).attr("id")+";";
......@@ -252,7 +252,7 @@ $(function () {
page_url = page_url.substr(0,page_url.lastIndexOf("/")) + '/' + $("#tmp_url").val();
var url_val = "index.php?eID=tx_nG6&type=download&data_folder=" + $("#data_folder").val() + "&tmp_folder=" + $("#temp_folder").val()
url_val += "&user_email=" + $("#user_email_val").val() + "&title_email=" + $("#download_email_title").val() + "&msg_email=" + $("#download_email_msg").val().replace("###SPAN_ARCHIVE_LINK###", page_url+"/SPAN_ARCHIVE_NAME");
url_val += "&format=" + $("input[type=radio][name=format]:checked").val() + "&ids=";
url_val += "&user_id=" + $("#user_id").val() + "&format=" + $("input[type=radio][name=format]:checked").val() + "&ids=";
$(".jstree-checked > ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked").each(function(){
url_val += $(this).attr("id")+";";
});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment