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
52227873
Commit
52227873
authored
9 years ago
by
Vishal Kadam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HDPDGI-53:Vishal: Use guid for link when name not exists
parent
161939b7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
searchController.js
dashboard/v2/public/modules/search/searchController.js
+3
-3
search.html
dashboard/v2/public/modules/search/views/search.html
+1
-1
No files found.
dashboard/v2/public/modules/search/searchController.js
View file @
52227873
...
...
@@ -18,10 +18,9 @@
'use strict'
;
angular
.
module
(
'dgc.search'
).
controller
(
'SearchController'
,
[
'$scope'
,
'$location'
,
'$http'
,
'$state'
,
'$stateParams'
,
'SearchResource'
,
'NotificationService'
,
function
(
$scope
,
$location
,
$http
,
$state
,
$stateParams
,
SearchResource
,
NotificationService
)
{
angular
.
module
(
'dgc.search'
).
controller
(
'SearchController'
,
[
'$scope'
,
'$location'
,
'$http'
,
'$state'
,
'$stateParams'
,
'
lodash'
,
'
SearchResource'
,
'NotificationService'
,
function
(
$scope
,
$location
,
$http
,
$state
,
$stateParams
,
_
,
SearchResource
,
NotificationService
)
{
$scope
.
types
=
[
'table'
,
'column'
,
'db'
,
'view'
,
'loadprocess'
,
'storagedesc'
];
$scope
.
results
=
[];
$scope
.
resultCount
=
0
;
$scope
.
isCollapsed
=
true
;
...
...
@@ -99,6 +98,7 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
$scope
.
filterSearchResults
=
function
(
items
)
{
var
res
=
{};
var
count
=
0
;
items
=
_
.
omit
(
items
,
[
'name'
,
'description'
,
'guid'
]);
angular
.
forEach
(
items
,
function
(
value
,
key
)
{
if
(
typeof
value
!==
'object'
&&
(
key
.
indexOf
(
'$$'
)
<
0
))
{
res
[
key
]
=
value
;
...
...
This diff is collapsed.
Click to expand it.
dashboard/v2/public/modules/search/views/search.html
View file @
52227873
...
...
@@ -37,7 +37,7 @@
<h4
ng-show=
"searchMessage"
>
{{searchMessage}}
</h4>
<ul
class=
"list-unstyled"
>
<li
ng-repeat=
"result in filteredResults"
class=
"searchresults"
>
<h4><a
data-ui-sref=
"details({id:result['$id$'].id
})"
>
{{result.name
}}
</a></h4>
<h4><a
data-ui-sref=
"details({id:result['$id$'].id
|| result.guid})"
>
{{result.name || result.guid
}}
</a></h4>
<p>
{{result.description}}
</p>
<span
ng-repeat=
"(key, value) in filterSearchResults(result)"
>
...
...
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