Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
persona
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hexang 息壤平台
persona
Commits
1348ee27
Commit
1348ee27
authored
13 years ago
by
Lloyd Hilaiel
Browse files
Options
Downloads
Plain Diff
merge fix for bug where details of errors on main site cannot be viewed. closes #1139
parents
6a023bae
0b08007d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/static/pages/page_helpers.js
+1
-0
1 addition, 0 deletions
resources/static/pages/page_helpers.js
resources/static/test/cases/pages/page_helpers.js
+15
-3
15 additions, 3 deletions
resources/static/test/cases/pages/page_helpers.js
with
16 additions
and
3 deletions
resources/static/pages/page_helpers.js
+
1
−
0
View file @
1348ee27
...
...
@@ -63,6 +63,7 @@ BrowserID.PageHelpers = (function() {
function
showFailure
(
error
,
info
,
callback
)
{
info
=
$
.
extend
(
info
||
{},
{
action
:
error
,
dialog
:
false
});
bid
.
Screens
.
error
.
show
(
"
error
"
,
info
);
errorDisplay
.
start
();
callback
&&
callback
(
false
);
}
...
...
This diff is collapsed.
Click to expand it.
resources/static/test/cases/pages/page_helpers.js
+
15
−
3
View file @
1348ee27
...
...
@@ -147,10 +147,22 @@
});
});
asyncTest
(
"
showFailure show
s
a failure screen
"
,
function
()
{
pageHelpers
.
showFailure
(
{},
errors
.
offline
,
function
()
{
asyncTest
(
"
showFailure
-
show a failure screen
, extended info can be opened
"
,
function
()
{
pageHelpers
.
showFailure
(
"
error
"
,
{
network
:
400
,
status
:
"
error
"
}
,
function
()
{
testHelpers
.
testErrorVisible
();
start
();
// We have to make sure the error screen itself is visible and that the
// extra info is hidden so when we click on the extra info it opens.
$
(
"
#error
"
).
show
();
$
(
"
#moreInfo
"
).
hide
();
$
(
"
#openMoreInfo
"
).
trigger
(
"
click
"
);
// Add a bit of delay to wait for the animation
setTimeout
(
function
()
{
equal
(
$
(
"
#moreInfo
"
).
is
(
"
:visible
"
),
true
,
"
extra info is visible after click
"
);
start
();
},
100
);
});
});
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment