Skip to content

Commit f6ff2fc

Browse files
ssarkisyssarkisy
committed
Fix port utilizing
1 parent 8e54fba commit f6ff2fc

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

‎src/js/controllers/MainCtrl.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ function MainCtrl($s, $state, $cookies, FormSrvc, SessionSrvc, UtilSrvc, $timeou
1111
document.cookie = "CSPWSERVERID" + "=; Path=" + $root.webapp + "; expires=Thu, 01 Jan 1970 00:00:01 GMT;";
1212
}
1313

14+
$root.getServerString = function() {
15+
var serverString = $root.protocol + $root.server +
16+
(($root.port) ? (":" + $root.port) : '') +
17+
"/" + $root.webapp;
18+
19+
return serverString;
20+
}
21+
1422
/*===============================================================
1523
VARIABLES INITIALIZATION
1624
===============================================================*/
@@ -21,7 +29,7 @@ function MainCtrl($s, $state, $cookies, FormSrvc, SessionSrvc, UtilSrvc, $timeou
2129
$root.port = config.port || location.port;
2230
$root.webapp = config.webapp || "forms";
2331

24-
if (!config.server || !config.port || !config.webapp) {
32+
if (!config.server || !config.webapp) {
2533
clearCookies();
2634
}
2735

‎src/js/services/FormSrvc.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,43 @@ function FormSrvc(RESTSrvc, $rootScope) {
44
return {
55
getFormsList:
66
function(baseAuthToken) {
7-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/info?size=500', headers: {'Authorization' : baseAuthToken} });
7+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/form/info?size=500', headers: {'Authorization' : baseAuthToken} });
88
},
99
// create new form object
1010
newForm:
1111
function(form, formType, baseAuthToken) {
12-
return RESTSrvc.getPromise( {method: 'POST', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/object/' + formType, data: form,
12+
return RESTSrvc.getPromise( {method: 'POST', url: $rootScope.getServerString() + '/form/object/' + formType, data: form,
1313
headers: {'Authorization' : baseAuthToken} });
1414
},
1515
// update form object
1616
updateForm:
1717
function(id, form, formType, baseAuthToken) {
18-
return RESTSrvc.getPromise( {method: 'PUT', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/object/' + formType + '/' + id, data: form, headers: {'Authorization' : baseAuthToken} });
18+
return RESTSrvc.getPromise( {method: 'PUT', url: $rootScope.getServerString() + '/form/object/' + formType + '/' + id, data: form, headers: {'Authorization' : baseAuthToken} });
1919
},
2020
// get form object
2121
getFormMetadata:
2222
function(formType, baseAuthToken) {
23-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/info/' + formType, headers: {'Authorization' : baseAuthToken} });
23+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/form/info/' + formType, headers: {'Authorization' : baseAuthToken} });
2424
},
2525
getCatalog:
2626
function(catalog, baseAuthToken) {
27-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/objects/' + catalog + '/infoclass?size=500', headers: {'Authorization' : baseAuthToken} });
27+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/form/objects/' + catalog + '/infoclass?size=500', headers: {'Authorization' : baseAuthToken} });
2828
},
2929
getCatalogMeta:
3030
function(catalog, baseAuthToken) {
31-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/info/' + catalog, headers: {'Authorization' : baseAuthToken} });
31+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/form/info/' + catalog, headers: {'Authorization' : baseAuthToken} });
3232
},
3333
getFormObjectsInfo:
3434
function(formType, baseAuthToken) {
35-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/objects/' + formType + '/info?size=500&orderby=2', headers: {'Authorization' : baseAuthToken} });
35+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/form/objects/' + formType + '/info?size=500&orderby=2', headers: {'Authorization' : baseAuthToken} });
3636
},
3737
getFormObject:
3838
function(formType, objectId, baseAuthToken) {
39-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/object/' + formType + '/' + objectId, headers: {'Authorization' : baseAuthToken} });
39+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/form/object/' + formType + '/' + objectId, headers: {'Authorization' : baseAuthToken} });
4040
},
4141
deleteObject:
4242
function(formType, objectId, baseAuthToken) {
43-
return RESTSrvc.getPromise( {method: 'DELETE', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/form/object/' + formType + '/' + objectId, headers: {'Authorization' : baseAuthToken} });
43+
return RESTSrvc.getPromise( {method: 'DELETE', url: $rootScope.getServerString() + '/form/object/' + formType + '/' + objectId, headers: {'Authorization' : baseAuthToken} });
4444
}
4545
}
4646
}

‎src/js/services/RESTSrvc.js

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ function RESTSrvc($http, $q) {
88

99
var langSetting = angular.fromJson(localStorage.rflanguage);
1010
var language = 'en';
11-
console.log(localStorage.rflanguage)
1211

1312
if (!angular.isUndefinedOrNullOrEmpty(langSetting)
1413
&& !angular.isUndefinedOrNullOrEmpty(langSetting.lang)) {

‎src/js/services/SessionSrvc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ function SessionSrvc(RESTSrvc, $rootScope) {
55
return {
66
logout:
77
function(baseAuthToken) {
8-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/logout', headers: {'Authorization' : baseAuthToken} });
8+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/logout', headers: {'Authorization' : baseAuthToken} });
99
},
1010

1111
getLanguageList:
1212
function(baseAuthToken) {
13-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/info', headers: {'Authorization' : baseAuthToken} });
13+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/info', headers: {'Authorization' : baseAuthToken} });
1414
}
1515
}
1616
}

‎src/js/services/WorklistSrvc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ function WorklistSrvc(RESTSrvc, $rootScope) {
66
// save worklist object
77
save:
88
function(worklist, baseAuthToken) {
9-
return RESTSrvc.getPromise( {method: 'POST', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/tasks/' + worklist._id, data: worklist,
9+
return RESTSrvc.getPromise( {method: 'POST', url: $rootScope.getServerString() + '/tasks/' + worklist._id, data: worklist,
1010
headers: {'Authorization' : baseAuthToken} });
1111
},
1212

1313
// get worklist by id
1414
get:
1515
function(id, baseAuthToken) {
16-
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.protocol + $rootScope.server + ":" + $rootScope.port + "/" + $rootScope.webapp + '/tasks/' + id,headers: {'Authorization' : baseAuthToken} });
16+
return RESTSrvc.getPromise( {method: 'GET', url: $rootScope.getServerString() + '/tasks/' + id,headers: {'Authorization' : baseAuthToken} });
1717
},
1818

1919
// get all worklists for current user

0 commit comments

Comments
 (0)