MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 23 Wiki Activity

change order in loading scripts | use new dnet45 claims - from scooby | change direct index original id to format userclaim___::md5(id) 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@47600 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2017-06-21 08:35:41 +00:00
parent 53b488f00a
commit a8add8b475
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
portal-2/src/app/claims/linking/insertClaim/insertClaim.component.ts
View File

@ -294,7 +294,7 @@ private errorsInClaimsInsertion(){
createDirectClaim(result, projects, contexts){
var entity = {};
var md5_id = Md5.hashStr(result.id);
entity["originalId"]="user:claim__"+md5_id;
entity["originalId"]="userclaim___::"+md5_id;
entity["title"]=result.title;
entity["title"] =(Array.isArray(result.title) && result.title.length > 0 )?result.title[0]:result.title;

6
portal-2/src/app/test/test.component.ts
View File

@ -44,9 +44,7 @@ export class TestComponent {
this.checktables(sf.ORGANIZATION_REFINE_FIELDS,sf.ORGANIZATION_FIELDS,sf.ORGANIZATION_FIELDS);
this.checktables(sf.ORGANIZATION_ADVANCED_FIELDS,sf.ORGANIZATION_FIELDS,sf.ORGANIZATION_FIELDS);
console.info("~~~PERSON");
this.checktables(sf.PERSON_REFINE_FIELDS,sf.PERSON_FIELDS,sf.PERSON_FIELDS);
this.checktables(sf.PERSON_ADVANCED_FIELDS,sf.PERSON_FIELDS,sf.PERSON_FIELDS);
}
checktables(fields,fieldsDetails,fieldsParam){
for(var i =0; i < fields.length; i++){
@ -59,5 +57,5 @@ export class TestComponent {
}

2
portal-2/src/app/utils/properties/openaireProperties.ts
View File

@ -38,7 +38,7 @@ export class OpenaireProperties {
private static loginAPIURL = "http://scoobydoo.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates";
private static loginAPIURL_pm = "https://beta.services.openaire.eu/uoa-user-management/api/users/authenticates";
private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-openaire-connector-service-2.0.0-SNAPSHOT/rest/claimsService/";
private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/";
private static claimsAPIURL_pm = "https://beta.services.openaire.eu/claims/rest/claimsService/";
private static searchAPIURLLAst_pm = "https://beta.services.openaire.eu/search/v2/api/";

35
portal-2/src/index.html
View File

@ -25,26 +25,35 @@
<title>Search OpenAIRE</title>
<script>
window.onerror = function (errorMsg, url, lineNumber, column, errorObj) {
console.log(errorMsg + " __" + url + " __" + lineNumber + " __" + column + " __" + errorObj);
// console.log(errorMsg + " __" + url + " __" + lineNumber + " __" + column + " __" + errorObj);
if(errorMsg.indexOf("uikit.js") != -1 || url.indexOf("uikit.js") != -1 ){
console.log("********UIKIT Error ***********");
jQuery.loadScript = function (url, callback) {
jQuery.ajax({
url: url,
dataType: 'script',
});}
$.loadScript("assets/dl119_files/uikit.js", function(){
console.log("LOOOOOOOOOOOOOOOOOOOAD");});
// location.reload();
// var script= document.createElement('script');
// script.type= 'text/javascript';
// script.src= 'assets/dl119_files/uikit.js';
// head.appendChild(script);
// console.log("LOOOOOOOOOOOOOOOOOOOAD");
// jQuery.loadScript = function (url, callback) {
// jQuery.ajax({
// url: url,
// dataType: 'script',
// });}
// $.loadScript("assets/dl119_files/uikit.js", function(){
// console.log("LOOOOOOOOOOOOOOOOOOOAD");});
}
}
</script>
<!-- <script src="assets/jquery/jquery.min.js" type="text/javascript"></script> -->
<script src="assets/dl119_files/jquery.js"></script>
<script src="assets/dl119_files/uikit.js"></script>
<script src="assets/dl119_files/uikit-icons-max.js"></script>
<script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
<script src="assets/dl119_files/jquery.js"></script>
<script src="assets/dl119_files/uikit.js"></script>
<script src="assets/dl119_files/uikit-icons-max.js"></script>
<!-- <link rel="stylesheet" href="node_modules/uikit/dist/css/uikit.min.css"> -->
<link rel="stylesheet" href="assets/dl119_files/theme.css">
<link rel="stylesheet" href="assets/dl119_files/custom.css">
@ -92,10 +101,10 @@ console.log("LOOOOOOOOOOOOOOOOOOOAD");});
<body class="" style="">
<div class="uk-offcanvas-content uk-height-viewport">
<script async src="/main.bundle.js"></script>
<script async src="/main.bundle.js"></script>
<app>
Loading Universal ...