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
aea51890
Commit
aea51890
authored
9 years ago
by
Vishal Kadam
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7 from MPR-Global/HDPDGI-46
Made change to remove splash page
parents
8f64e6af
24c9b7b5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
routes.js
dashboard/v2/public/js/routes.js
+1
-1
searchController.js
dashboard/v2/public/modules/search/searchController.js
+6
-6
No files found.
dashboard/v2/public/js/routes.js
View file @
aea51890
...
...
@@ -23,6 +23,6 @@ angular.module('dgc').config(['$locationProvider', '$urlRouterProvider',
function
(
$locationProvider
,
$urlRouterProvider
)
{
$locationProvider
.
hashPrefix
(
'!'
);
// For unmatched routes:
$urlRouterProvider
.
otherwise
(
'/'
);
$urlRouterProvider
.
otherwise
(
'/
search
'
);
}
]);
This diff is collapsed.
Click to expand it.
dashboard/v2/public/modules/search/searchController.js
View file @
aea51890
...
...
@@ -47,12 +47,12 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
$scope
.
resultRows
=
$scope
.
results
.
rows
;
$scope
.
totalItems
=
$scope
.
resultCount
;
$scope
.
transformedResults
=
{};
$scope
.
dataTransitioned
=
false
;
if
(
response
.
results
.
dataType
.
typeName
.
indexOf
(
'__'
)
===
0
)
{
$scope
.
dataTransitioned
=
true
;
$scope
.
dataTransitioned
=
false
;
if
(
response
.
results
.
dataType
.
typeName
.
indexOf
(
'__'
)
===
0
)
{
$scope
.
dataTransitioned
=
true
;
var
attrDef
=
response
.
results
.
dataType
.
attributeDefinitions
;
angular
.
forEach
(
attrDef
,
function
(
value
)
{
if
(
value
.
dataTypeName
===
'__IdType'
)
{
if
(
value
.
dataTypeName
===
'__IdType'
)
{
$scope
.
searchKey
=
value
.
name
;
}
});
...
...
@@ -88,8 +88,8 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
$scope
.
filterResults
=
function
()
{
var
res
=
[];
angular
.
forEach
(
$scope
.
resultRows
,
function
(
value
,
key
)
{
res
.
push
(
value
[
$scope
.
searchKey
]
);
angular
.
forEach
(
$scope
.
resultRows
,
function
(
value
)
{
res
.
push
(
value
[
$scope
.
searchKey
]
);
});
return
res
;
};
...
...
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