Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Maxime Chaillet
doi-landing-page
Commits
2759a318
Commit
2759a318
authored
Oct 15, 2018
by
Chaillet Maxime
Browse files
Fix merge conflicts. run grunt dev and grunt.
parents
9804b28b
e695453e
Pipeline
#5904
failed with stages
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
www/min/doi.min.js
View file @
2759a318
This diff is collapsed.
Click to expand it.
www/src/jsonextractor.js
View file @
2759a318
...
...
@@ -104,4 +104,4 @@ JsonExtractor.prototype.getResourceType = function (data) {
}
}
return
null
;
};
\ No newline at end of file
};
www/src/metadataTableHelper.js
View file @
2759a318
...
...
@@ -11,9 +11,9 @@ function proposalBeamLineTable(chunk, context, bodies, params) {
chunk
.
write
(
'
</thead>
'
);
chunk
.
write
(
'
<tbody>
'
);
for
(
let
index
=
0
;
index
<
proposals
.
length
;
index
++
)
{
const
proposal
=
proposals
[
index
];
const
beamline
=
beamlines
[
index
];
for
(
var
index
=
0
;
index
<
proposals
.
length
;
index
++
)
{
var
proposal
=
proposals
[
index
];
var
beamline
=
beamlines
[
index
];
chunk
.
write
(
'
<tr>
'
);
chunk
.
write
(
'
<td>
'
+
proposals
[
index
]
+
'
</td>
'
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment