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
0bf878de
Commit
0bf878de
authored
8 years ago
by
Hemanth Yamijala
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-927 aboutAtlas_tmpl.html has hard-coded project version (Kalyanikashikar via yhemanth)
parent
607e7de2
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
83 additions
and
11 deletions
+83
-11
AtlasAuthorizationUtils.java
...pache/atlas/authorize/simple/AtlasAuthorizationUtils.java
+1
-1
ApacheAtlasLogo.png
dashboardv2/public/img/ApacheAtlasLogo.png
+0
-0
VCommon.js
dashboardv2/public/js/models/VCommon.js
+11
-0
Router.js
dashboardv2/public/js/router/Router.js
+4
-8
aboutAtlas_tmpl.html
dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
+1
-2
aboutAtlas.js
dashboardv2/public/js/views/common/aboutAtlas.js
+65
-0
release-log.txt
release-log.txt
+1
-0
No files found.
authorization/src/main/java/org/apache/atlas/authorize/simple/AtlasAuthorizationUtils.java
View file @
0bf878de
...
...
@@ -103,7 +103,7 @@ public class AtlasAuthorizationUtils {
String
api
=
getApi
(
contextPath
);
if
(
api
.
startsWith
(
"types"
))
{
resourceTypes
.
add
(
AtlasResourceTypes
.
TYPE
);
}
else
if
(
api
.
startsWith
(
"admin"
)
&&
contextPath
.
contains
(
"/session"
))
{
}
else
if
(
api
.
startsWith
(
"admin"
)
&&
(
contextPath
.
contains
(
"/session"
)
||
contextPath
.
contains
(
"/version"
)
))
{
resourceTypes
.
add
(
AtlasResourceTypes
.
UNKNOWN
);
}
else
if
((
api
.
startsWith
(
"discovery"
)
&&
contextPath
.
contains
(
"/gremlin"
))
||
api
.
startsWith
(
"admin"
)
||
api
.
startsWith
(
"graph"
))
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/img/ApacheAtlasLogo.png
deleted
100644 → 0
View file @
607e7de2
3.04 KB
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/models/VCommon.js
View file @
0bf878de
...
...
@@ -37,6 +37,17 @@ define(['require',
toString
:
function
()
{
return
this
.
get
(
'name'
);
},
/*************************
* Non - CRUD operations
*************************/
aboutUs
:
function
(
url
,
options
)
{
var
url
=
Globals
.
baseURL
+
url
;
options
=
_
.
extend
({
contentType
:
'application/json'
,
dataType
:
'json'
},
options
);
return
this
.
constructor
.
nonCrudOperation
.
call
(
this
,
url
,
'GET'
,
options
);
}
},
{});
return
VCommon
;
});
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/router/Router.js
View file @
0bf878de
...
...
@@ -57,14 +57,10 @@ define([
var
that
=
this
;
require
([
'hbs!tmpl/common/aboutAtlas_tmpl'
,
'modules/Modal'
],
function
(
aboutAtlasTmpl
,
Modal
)
{
var
aboutAtlas
=
Marionette
.
LayoutView
.
extend
({
template
:
aboutAtlasTmpl
,
events
:
{},
});
var
view
=
new
aboutAtlas
();
'modules/Modal'
,
'views/common/aboutAtlas'
,
],
function
(
aboutAtlasTmpl
,
Modal
,
aboutAtlasView
)
{
var
view
=
new
aboutAtlasView
();
var
modal
=
new
Modal
({
title
:
'Apache Atlas'
,
content
:
view
,
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
View file @
0bf878de
...
...
@@ -16,9 +16,8 @@
-->
<div
class=
"row"
>
<div
class=
"col-md-4"
>
<img
src=
"img/ApacheAtlasLogo.png"
class=
"img-responsive"
>
<div
class=
"col-md-8 subContent"
>
<p
class=
"ng-binding"
><b>
Version :
</b>
0.7-incubating-SNAPSHOT-ra2cc01c4342ace7f7a3e3e254d7ede781f990318
</p>
<p
data-id=
"atlasVersion"
>
</p>
<br>
<p
class=
"text-info"
>
Get involved!
</p>
<p
class=
"text-info"
><a
href=
"http://apache.org/licenses/LICENSE-2.0"
target=
"_blank"
>
Licensed under the Apache License Version 2.0
</a></p>
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/common/aboutAtlas.js
0 → 100644
View file @
0bf878de
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
define
([
'require'
,
'backbone'
,
'hbs!tmpl/common/aboutAtlas_tmpl'
,
'models/VCommon'
],
function
(
require
,
Backbone
,
aboutAtlasTmpl
,
VCommon
)
{
'use strict'
;
var
aboutAtlasView
=
Backbone
.
Marionette
.
LayoutView
.
extend
(
/** @lends aboutAtlasView */
{
template
:
aboutAtlasTmpl
,
/** Layout sub regions */
regions
:
{},
/** ui selector cache */
ui
:
{
atlasVersion
:
"[data-id='atlasVersion']"
},
/** ui events hash */
events
:
function
()
{},
/**
* intialize a new aboutAtlasView Layout
* @constructs
*/
initialize
:
function
(
options
)
{
_
.
extend
(
this
,
_
.
pick
(
options
,
'globalVent'
));
},
bindEvents
:
function
()
{
},
onRender
:
function
()
{
var
that
=
this
;
var
url
=
"/api/atlas/admin/version"
;
var
VCommonModel
=
new
VCommon
();
VCommonModel
.
aboutUs
(
url
,
{
success
:
function
(
data
)
{
var
str
=
"<b>Version : </b>"
+
data
.
Version
;
that
.
ui
.
atlasVersion
.
html
(
str
);
},
error
:
function
(
error
,
data
,
status
)
{},
complete
:
function
()
{}
});
},
});
return
aboutAtlasView
;
});
This diff is collapsed.
Click to expand it.
release-log.txt
View file @
0bf878de
...
...
@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
ALL CHANGES:
ATLAS-927 aboutAtlas_tmpl.html has hard-coded project version (Kalyanikashikar via yhemanth)
ATLAS-624 UI: Clicking a tag hyperlink should always result in DSL search. In some cases, results in full-text search. (Kalyanikashikar via yhemanth)
ATLAS-950 Atlas should support Solr that requires Kerberos authentication (madhan.neethiraj via yhemanth)
ATLAS-947 Return state information in inputs and outputs lineage API (shwethags)
...
...
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