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

draw_fatal_error_page : hide sql query #42

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

draw_fatal_error_page : hide sql query #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd4409b
draw_fatal_error_page : hide sql query
vprokhorova Jul 14, 2023
bbbfb45
draw_fatal_error_page : fix error message
vprokhorova Oct 19, 2023
8f986ff
draw_fatal_error_page : fix for iframe
vprokhorova Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Eludia/Content/Tie/I18n/RUS.pm
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
����� �������� �� ��������� ������ (������� �� �� ��������� ���������� �� ������).
EOT
mail_support => "��������� e-mail � ������ ����������� ���������",
internal_error_we_know => '��������� � ��� ��� ���������� � ������ ������������ � �� ���������� � �� �����������.',
internal_error_we_know => '��������� � ��� ��� ���������� � ������ ������������, � �� ���������� � �� �����������.',
log_on => '������',
login => '�����',
mandatory_f => '�����������',
Expand Down
2 changes: 1 addition & 1 deletion Eludia/Content/Watchdog.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ sub log_error {

my ($options) = @_;

print STDERR $options -> {error} . "\n";
print STDERR $options -> {label} . "\n" . $options -> {error} . "\n";

my $log = $preconf -> {_} -> {logs} . 'fatal.log';

Expand Down
78 changes: 60 additions & 18 deletions Eludia/Presentation/Skins/Mint.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,49 +410,91 @@ sub draw_fatal_error_page {

$_REQUEST {__content_type} ||= 'text/html; charset=' . $i18n -> {_charset};

my $head_links;

my $details = $error -> {label};
$details =~ s/\sprocess.*$/]/;
jonny64 marked this conversation as resolved.
Show resolved Hide resolved


my $options = {
email => $preconf -> {mail}? $preconf -> {mail} -> {support} : '',
subject => "������������ ($$preconf{about_name}). ������ �� $$_USER{label}",
title => $i18n -> {internal_error},
details => $error -> {label} . "\n" . $error -> {error},
details => $details,
msg => $error -> {msg},
label => $error -> {label},
label => $details,
href => "$_REQUEST{__static_url}/error.html?",
height => 290,
height => 280,
width => 510,
close => $i18n -> {close},
show_error_detail => $i18n -> {show_error_detail},
error_hint_area => $i18n -> {error_hint_area},
mail_support => $i18n -> {mail_support},
blockUI_msg => '��������� ���������� ������',
};

$options = $_JSON -> encode ($options);

$head_links = qq {
<link rel="stylesheet" href="/i/_skins/Mint/eludia.css" type="text/css">
<link rel="stylesheet" href="/i/mint/libs/jQueryUI/jquery-ui.min.css" type="text/css">
<link rel="stylesheet" href="/i/mint/libs/SuperTable/supertable.css" type="text/css">

<script src="/i/mint/libs/KendoUI/js/jquery.min.js"></script>
<script src="/i/_skins/Mint/jquery.blockUI.js"></script>

<script src="/i/_skins/Mint/navigation.js"></script>
<script src="/i/mint/libs/jQueryUI/jquery-ui.min.js"></script>
<script src="/i/mint/libs/require.min.js"></script>
<script src="/i/_skins/Mint/jQuery.showModalDialog.js"></script>

};


$head_links .= <<EOJS;
<script>
requirejs.config({
baseUrl: '/i/mint/libs/KendoUI/js/',
shim: {
'/i/mint/libs/jQueryUI/jquery-ui.min.js' : {
deps: ['jquery.min']
},
}
});
</script>
EOJS

$_REQUEST {__script} .= <<EOJS;

var parent_frame = parent;
var parent_frame = parent ? parent : window;

var top_w = parent_frame.ancestor_window_with_child('eludia-application-iframe')
var top_w = parent_frame.ancestor_window_with_child('eludia-application-iframe')

var eludia_frame = top_w && top_w.child? top_w.child.contentWindow : parent_frame;
var eludia_frame = top_w && top_w.child? top_w.child.contentWindow : parent_frame;

var options = $options;
var options = $options;

options.after = function() {
parent_frame.unblockui();
};
options.after = function() {
parent_frame.unblockui();
};


if (eludia_frame.dialog_open) {
eludia_frame.dialog_open (options);
} else {
alert (options.label);
if (window.name != 'invisible') {history.go (-1)};
}

if (eludia_frame.dialog_open) {
eludia_frame.dialog_open (options);
} else {
alert (options.label);
if (window.name != 'invisible') {history.go (-1)};
}
EOJS

$_REQUEST {__head_links} .= dump_tag (script => {}, $_REQUEST {__script}) . "\n";
$_REQUEST {__script} = <<EOJ;
function on_load () {
$_REQUEST{__script}
}
EOJ

return qq{<html><head>$_REQUEST{__head_links}</head><body></body></html>};
return qq{<html><head>$head_links<script>$_REQUEST{__script}</script></head><body onLoad="on_load ()"></body></html>};

}

Expand Down
34 changes: 8 additions & 26 deletions Eludia/Presentation/Skins/Mint/error.html.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,22 @@
width: auto;
margin-right: 20px;
}
#error_detail_area {
margin: 5px;
}
</style>
<script src="/i/mint/libs/KendoUI/js/jquery.min.js"></script>
<script>
function toggle_detail() {
$("#error_detail_area").toggle();
$("#mail_support_area").toggle();
var label = $('#error_detail_area').is(":visible")? "������ ����������� ������" : "�������� ����������� ������";
$("#toggle_detail").text(label);
}

function support_mailto_href(options) {
var href = 'mailto:' + options.email + '?';
href = href + 'subject=' + encodeURIComponent(options.subject);
href = href + '&body=' + encodeURIComponent(
"����������, �������� ������� ���� �������� �� ��������� ������ �����:\n\n\n" + options.label
"����������, �������� ������� ���� �������� �� ��������� ������ �����:\n\n\n"
+ "���� ��������� ��������� ����������, ����������, �� �������� � �� ������������:\n"
+ options.label
);

return href;
}


function on_load(){

var dialogArguments = parent.dialogArguments;
Expand All @@ -48,12 +40,10 @@

window.returnValue = {'result': 'esc'};

if(dialogArguments.details)
$('#error_detail').val(dialogArguments.details);
if (dialogArguments.details)
$('#error_detail').text(dialogArguments.details);
if (dialogArguments.msg)
$('#error_message_area').text(dialogArguments.msg);
if (dialogArguments.show_error_detail)
$('#toggle_detail').text(dialogArguments.show_error_detail);
if (dialogArguments.error_hint_area)
$('#error_hint_area').text(dialogArguments.error_hint_area);
if (dialogArguments.mail_support)
Expand All @@ -70,18 +60,10 @@
<img src="/i/_skins/Mint/error.png" class="help-image"></img>
</div>
<p>
<span id="error_message_area">
��������� ���������� ������.
</span>
</p>
<p>
<a href="#" id="toggle_detail" onclick="toggle_detail();">�������� ����������� ������</a>
<span id="error_message_area"></span>
</p>
<p>
<span id="error_detail_area" style="display: none">
<textarea id="error_detail" rows="8" cols="62"></textarea>
</span>
<p></p>
<span id="error_detail"></span>
</p>
<span id="mail_support_area">
<p>
Expand All @@ -98,4 +80,4 @@
<a id="button_close" href="javascript: parent.close ();" style="float:right">�������</div>
</span>
</body>
</html>
</html>
4 changes: 3 additions & 1 deletion Eludia/Presentation/Skins/Mint/navigation.js.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,10 @@ function dialog_open (options) {

var url = window.location.protocol + '//' + window.location.host + '/i/_skins/Mint/dialog.html?' + Math.random();

options.blockUI_msg = options.blockUI_msg || i18n.choose_open_vocabulary;

if ($.browser.webkit || $.browser.safari)
$.blockUI ({fadeIn: 0, message: '<h1>' + i18n.choose_open_vocabulary + '</h1>'});
$.blockUI ({fadeIn: 0, message: '<h1>' + options.blockUI_msg + '</h1>'});

var getDialogSize = function(type, size) {
return size
Expand Down
8 changes: 6 additions & 2 deletions Eludia/Presentation/Skins/TurboMilk.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,22 +602,26 @@ sub draw_fatal_error_page {

my $head_links;

my $details = $error -> {label};
$details =~ s/\sprocess.*$/]/;

if ($error -> {kind}) {

my $options = {
email => $preconf -> {mail}? $preconf -> {mail} -> {support} : '',
subject => "������������ ($$preconf{about_name}). ������ �� $$_USER{label}",
title => $i18n -> {internal_error},
details => $error -> {label} . "\n" . $error -> {error},
details => $details,
msg => $error -> {msg},
label => $error -> {label},
label => $details,
href => "$_REQUEST{__static_url}/error.html?",
height => 280,
width => 510,
close => $i18n -> {close},
show_error_detail => $i18n -> {show_error_detail},
error_hint_area => $i18n -> {error_hint_area},
mail_support => $i18n -> {mail_support},
blockUI_msg => '��������� ���������� ������',
};

$options = $_JSON -> encode ($options);
Expand Down
25 changes: 5 additions & 20 deletions Eludia/Presentation/Skins/TurboMilk/error.html.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,17 @@
width: auto;
margin-right: 20px;
}
#error_detail_area {
margin: 5px;
}
</style>
<script src="/i/_skins/TurboMilk/navigation.js"></script>
<script>
function toggle_detail() {
$("#error_detail_area").toggle();
$("#mail_support_area").toggle();
var label = $('#error_detail_area').is(":visible")? "������ ����������� ������" : "�������� ����������� ������";
$("#toggle_detail").text(label);
}

function support_mailto_href(options) {
var href = 'mailto:' + options.email + '?';
href = href + 'subject=' + encodeURIComponent(options.subject);
href = href + '&body=' + encodeURIComponent(
"����������, �������� ������� ���� �������� �� ��������� ������ �����:\n\n\n" + options.label
"����������, �������� ������� ���� �������� �� ��������� ������ �����:\n\n\n"
+ "���� ��������� ��������� ����������, ����������, �� �������� � �� ������������:\n"
+ options.label
);

return href;
Expand All @@ -44,11 +37,9 @@
window.returnValue = {'result': 'esc'};

if(dialogArguments.details)
$('#error_detail').val(dialogArguments.details);
$('#error_detail').text(dialogArguments.details);
if (dialogArguments.msg)
$('#error_message_area').text(dialogArguments.msg);
if (dialogArguments.show_error_detail)
$('#toggle_detail').text(dialogArguments.show_error_detail);
if (dialogArguments.error_hint_area)
$('#error_hint_area').text(dialogArguments.error_hint_area);
if (dialogArguments.mail_support)
Expand All @@ -70,13 +61,7 @@
</span>
</p>
<p>
<a href="#" id="toggle_detail" onclick="toggle_detail();">�������� ����������� ������</a>
</p>
<p>
<span id="error_detail_area" style="display: none">
<textarea id="error_detail" rows="8" cols="57"></textarea>
</span>
<p></p>
<span id="error_detail"></span>
</p>
<span id="mail_support_area">
<p>
Expand Down