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
98917621
Commit
98917621
authored
9 years ago
by
Vishal Kadam
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14 from MPR-Global/HDPDGI-85-2
HDPDGI-85: Vishal: Pass user.name for each backend api when available…
parents
970115d0
5da40182
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
app.js
dashboard/v2/public/js/app.js
+16
-4
navigationResource.js
dashboard/v2/public/modules/navigation/navigationResource.js
+1
-1
No files found.
dashboard/v2/public/js/app.js
View file @
98917621
...
@@ -38,15 +38,27 @@ angular.module('dgc').factory('lodash', ['$window',
...
@@ -38,15 +38,27 @@ angular.module('dgc').factory('lodash', ['$window',
function
(
$window
)
{
function
(
$window
)
{
return
$window
.
d3
;
return
$window
.
d3
;
}
}
]).
factory
(
'Global'
,
[
'$window'
,
]).
factory
(
'Global'
,
[
'$window'
,
'$location'
,
function
(
$window
)
{
function
(
$window
,
$location
)
{
return
{
return
{
user
:
$
window
.
user
,
user
:
$
location
.
search
()[
'user.name'
]
,
authenticated
:
!!
$window
.
user
,
authenticated
:
!!
$window
.
user
,
renderErrors
:
$window
.
renderErrors
renderErrors
:
$window
.
renderErrors
};
};
}
}
]).
run
([
'$rootScope'
,
'Global'
,
'NotificationService'
,
'lodash'
,
'd3'
,
function
(
$rootScope
,
Global
,
NotificationService
,
lodash
,
d3
)
{
]).
factory
(
'HttpInterceptor'
,
[
'Global'
,
function
(
Global
)
{
return
{
'request'
:
function
(
config
)
{
if
(
config
.
url
&&
(
config
.
url
.
indexOf
(
'api/atlas/'
)
===
0
||
config
.
url
.
indexOf
(
'/api/atlas/'
)
===
0
))
{
config
.
params
=
config
.
params
||
{};
config
.
params
[
'user.name'
]
=
Global
.
user
;
}
return
config
;
}
};
}]).
config
([
'$httpProvider'
,
function
(
$httpProvider
)
{
$httpProvider
.
interceptors
.
push
(
'HttpInterceptor'
);
}]).
run
([
'$rootScope'
,
'Global'
,
'NotificationService'
,
'lodash'
,
'd3'
,
function
(
$rootScope
,
Global
,
NotificationService
,
lodash
,
d3
)
{
var
errors
=
Global
.
renderErrors
;
var
errors
=
Global
.
renderErrors
;
if
(
angular
.
isArray
(
errors
)
||
angular
.
isObject
(
errors
))
{
if
(
angular
.
isArray
(
errors
)
||
angular
.
isObject
(
errors
))
{
lodash
.
forEach
(
errors
,
function
(
err
)
{
lodash
.
forEach
(
errors
,
function
(
err
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboard/v2/public/modules/navigation/navigationResource.js
View file @
98917621
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
'use strict'
;
'use strict'
;
angular
.
module
(
'dgc.navigation'
).
factory
(
'NavigationResource'
,
[
'$resource'
,
function
(
$resource
)
{
angular
.
module
(
'dgc.navigation'
).
factory
(
'NavigationResource'
,
[
'$resource'
,
function
(
$resource
)
{
return
$resource
(
'api/atlas/types?type=TRAIT'
,
{},
{
return
$resource
(
'
/
api/atlas/types?type=TRAIT'
,
{},
{
get
:
{
get
:
{
'method'
:
'GET'
,
'method'
:
'GET'
,
'responseType'
:
'json'
,
'responseType'
:
'json'
,
...
...
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