Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
18ac31db
Commit
18ac31db
authored
6 years ago
by
gutkaBinit
Committed by
nixonrodrigues
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3066 : UI : Fix various table layouts & improvements.
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
5c844562
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
common.scss
dashboardv2/public/css/scss/common.scss
+1
-1
CommonViewFunction.js
dashboardv2/public/js/utils/CommonViewFunction.js
+5
-5
AuditTableLayoutView.js
dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+1
-1
DetailPageLayoutView.js
...ardv2/public/js/views/detail_page/DetailPageLayoutView.js
+1
-1
No files found.
dashboardv2/public/css/scss/common.scss
View file @
18ac31db
...
...
@@ -118,7 +118,7 @@ pre {
overflow
:
hidden
;
&
.shrink
{
height
:
1
00
px
;
height
:
1
12
px
;
white-space
:
-
moz-pre-wrap
;
/* Mozilla, supported since 1999 */
white-space
:
-
pre-wrap
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/CommonViewFunction.js
View file @
18ac31db
...
...
@@ -89,7 +89,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
return
numberFormat
(
val
);
}
}
else
{
return
val
;
return
val
||
"N/A"
;
}
},
fetchInputOutputValue
=
function
(
id
,
defEntity
)
{
...
...
@@ -252,16 +252,16 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
}
if
(
isTable
)
{
var
htmlTag
=
'<div class="scroll-y">'
+
getValue
(
val
)
+
'</div>'
;
if
(
_
.
isObject
(
valueObject
[
key
]))
{
if
(
_
.
isObject
(
valueObject
[
key
])
&&
!
_
.
isEmpty
(
valueObject
[
key
])
)
{
var
matchedLinkString
=
val
.
match
(
/href|value-loader
\w
*/g
),
matchedJson
=
val
.
match
(
/json-value|json-string
\w
*/g
),
isMatchLinkStringIsSingle
=
matchedLinkString
&&
matchedLinkString
.
length
==
1
,
isMatchLinkStringIsSingle
=
matchedLinkString
&&
matchedLinkString
.
length
<=
5
,
isMatchJSONStringIsSingle
=
matchedJson
&&
matchedJson
.
length
==
1
,
expandCollapseButton
=
""
;
if
((
matchedJson
&&
!
isMatchJSONStringIsSingle
)
||
(
matchedLinkString
&&
!
isMatchLinkStringIsSingle
))
{
var
expandCollapseButton
=
'<button class="expand-collapse-button"><i class="fa"></i></button>'
expandCollapseButton
=
'<button class="expand-collapse-button"><i class="fa"></i></button>'
;
htmlTag
=
'<pre class="shrink code-block '
+
(
isMatchJSONStringIsSingle
?
'fixed-height'
:
''
)
+
'">'
+
expandCollapseButton
+
'<code>'
+
val
+
'</code></pre>'
;
}
var
htmlTag
=
'<pre class="shrink code-block '
+
(
isMatchJSONStringIsSingle
?
'fixed-height'
:
''
)
+
'">'
+
expandCollapseButton
+
'<code>'
+
val
+
'</code></pre>'
;
}
table
+=
'<tr><td>'
+
_
.
escape
(
key
)
+
'</td><td>'
+
htmlTag
+
'</td></tr>'
;
}
else
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/audit/AuditTableLayoutView.js
View file @
18ac31db
...
...
@@ -153,9 +153,9 @@ define(['require',
if
(
that
.
pervOld
.
length
===
0
)
{
options
.
previous
.
attr
(
'disabled'
,
true
);
}
that
.
renderTableLayoutView
();
}
}
that
.
renderTableLayoutView
();
that
.
$
(
'.fontLoader'
).
hide
();
that
.
$
(
'.tableOverlay'
).
hide
();
that
.
$
(
'.auditTable'
).
show
();
// Only for first time table show because we never hide after first render.
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
View file @
18ac31db
...
...
@@ -259,7 +259,7 @@ define(['require',
if
(
schemaOptions
&&
schemaOptions
.
hasOwnProperty
(
'schemaElementsAttribute'
)
&&
schemaOptions
.
schemaElementsAttribute
!==
""
)
{
this
.
$
(
'.schemaTable'
).
show
();
this
.
renderSchemaLayoutView
(
_
.
extend
({},
obj
,
{
attribute
:
collectionJSON
.
attributes
[
schemaOptions
.
schemaElementsAttribute
]
attribute
:
collectionJSON
.
attributes
[
schemaOptions
.
schemaElementsAttribute
]
||
collectionJSON
.
relationshipAttributes
[
schemaOptions
.
schemaElementsAttribute
]
}));
}
else
if
(
this
.
value
&&
this
.
value
.
tabActive
==
"schema"
)
{
Utils
.
setUrl
({
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment