Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-06-10 15:49:05 +02:00
parent 96053268aa 1542ee4c6d
commit 2169778f06
6 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmake/FindOpenSSL.cmake
View File

@ -73,19 +73,19 @@ endif()
if (WIN32)
# 32-bit not officially supported anymore anyway
set(SSL_BITS "x64")
set(SSL_NUGET_RELEASE "Release") # there also is Debug if you want to...
set(SSL_NUGET_RELEASE "release") # there also is Debug if you want to...
set(SSL_NUGET_TARGET "${SSL_NUGET_RELEASE}/target")
# v140 corresponds to VS 2015
# dynamic dll openssl looks like that...
#set(SSL_NUGET_DIR "lib/native/v140/windesktop/msvcstl/dyn/rt-dyn")
#set(SSL_NUGET_ROOT "$ENV{USERPROFILE}/.nuget/packages/openssl.v140.windesktop.msvcstl.dyn.rt-dyn.${SSL_BITS}")
set(SSL_NUGET_DIR "lib/v140/")
set(SSL_NUGET_ROOT "$ENV{USERPROFILE}/.nuget/packages/rmt_openssl/")
set(SSL_NUGET_DIR "v140/windesktop/msvcstl/static/rt-dyn")
set(SSL_NUGET_ROOT "$ENV{USERPROFILE}/.nuget/packages/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64/")
if (NOT OPENSSL_ROOT_DIR AND IS_DIRECTORY ${SSL_NUGET_ROOT})
# find latest version based on folder name and assign to OPENSSL_ROOT_DIR
FILE(GLOB dirlist RELATIVE ${SSL_NUGET_ROOT} ${SSL_NUGET_ROOT}/*)
list(SORT dirlist)
list(LENGTH dirlist listlength)
math(EXPR lastindex "${listlength}-1")
@ -105,12 +105,13 @@ if (WIN32)
set(OPENSSL_INCLUDE "${OPENSSL_ROOT_DIR}/build/native/include")
set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/build/native/${SSL_NUGET_DIR}/${SSL_BITS}")
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/lib/native/${SSL_NUGET_DIR}/${SSL_BITS}")
set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
set(_OPENSSL_ROOT_PATHS
"${OPENSSL_ROOT_DIR}/build/native/include"
"${OPENSSL_ROOT_DIR}/build/native/${SSL_NUGET_DIR}/")
"${OPENSSL_ROOT_DIR}/lib/native/${SSL_NUGET_DIR}/")
# ${OPENSSL_ROOT_DIR}/${SSL_NUGET_DIR}/${SSL_BITS}/"
else()
# http://www.slproweb.com/products/Win32OpenSSL.html
set(_OPENSSL_ROOT_HINTS
@ -178,24 +179,23 @@ if(WIN32 AND NOT CYGWIN)
#endif ()
set(LIB_EAY_DEBUG LIB_EAY_DEBUG-NOTFOUND)
if (EXISTS "${OPENSSL_LIB_DIR}/Debug/static/libeay32.lib")
set(LIB_EAY_DEBUG "${OPENSSL_LIB_DIR}/Debug/static/libeay32.lib")
if (EXISTS "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
set(LIB_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
endif()
set(LIB_EAY_RELEASE LIB_EAY_RELEASE-NOTFOUND)
if (EXISTS "${OPENSSL_LIB_DIR}/Release/static/libeay32.lib")
set(LIB_EAY_RELEASE "${OPENSSL_LIB_DIR}/Release/static/libeay32.lib")
if (EXISTS "${OPENSSL_LIB_DIR}/release/libeay32.lib")
set(LIB_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/libeay32.lib")
endif()
set(SSL_EAY_DEBUG SSL_EAY_DEBUG-NOTFOUND)
if (EXISTS "${OPENSSL_LIB_DIR}/Debug/static/ssleay32.lib")
set(SSL_EAY_DEBUG "${OPENSSL_LIB_DIR}/Debug/static/ssleay32.lib")
if (EXISTS "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
set(SSL_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
endif()
set(SSL_EAY_RELEASE SSL_EAY_RELEASE-NOTFOUND)
if (EXISTS "${OPENSSL_LIB_DIR}/Release/static/ssleay32.lib")
set(SSL_EAY_RELEASE "${OPENSSL_LIB_DIR}/Release/static/ssleay32.lib")
if (EXISTS "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
set(SSL_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
endif()
set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
@ -544,7 +544,3 @@ endif()
if(OPENSSL_USE_STATIC_LIBS)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
endif()
if (OPENSSL_ROOT_DIR AND SSL_NUGET)
set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR};${OPENSSL_INCLUDE_DIR}/v140/${SSL_BITS}/${SSL_NUGET_RELEASE}/static/")
endif()

4
js/apps/system/_admin/aardvark/APP/aardvark.js
View File

@ -219,10 +219,10 @@ authRouter.post('/query/upload/:user', function(req, res) {
authRouter.get('/query/download/:user', function(req, res) {
let user;
let user = req.pathParams.user;
try {
user = users.document(req.user);
user = users.document(user);
} catch (e) {
if (!e.isArangoError || e.errorNum !== ERROR_USER_NOT_FOUND) {
throw e;

8
js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoQueries.js
View File

@ -11,7 +11,7 @@
$.ajax("whoAmI?_=" + Date.now(), {async: true}).done(
function(data) {
if (this.activeUser === false) {
if (this.activeUser === false || this.activeUser === null) {
self.activeUser = "root";
}
else {
@ -29,7 +29,7 @@
parse: function(response) {
var self = this, toReturn;
if (this.activeUser === false) {
if (this.activeUser === false || this.activeUser === null) {
this.activeUser = "root";
}
@ -48,10 +48,10 @@
},
saveCollectionQueries: function(callback) {
if (this.activeUser === 0) {
if (this.activeUser === false || this.activeUser === null) {
return false;
}
if (this.activeUser === false) {
if (this.activeUser === false || this.activeUser === null) {
this.activeUser = "root";
}

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/userPermissions.js
View File

@ -87,7 +87,7 @@
//NOW FETCH USER PERMISSIONS
$.ajax({
type: "GET",
url: arangoHelper.databaseUrl("/_api/user/" + encodeURIComponent(self.currentUser.get("user")) + "/permission"),
url: arangoHelper.databaseUrl("/_api/user/" + encodeURIComponent(self.currentUser.get("user")) + "/database"),
//url: arangoHelper.databaseUrl("/_api/database/user/" + encodeURIComponent(this.currentUser.get("user"))),
contentType: "application/json",
success: function(data) {

2
js/apps/system/_admin/aardvark/APP/frontend/scss/_collection.scss
View File

@ -134,7 +134,7 @@
#infoTab a,
#graphTab a,
#collectionTab a {
background-color: $c-new-grey;
background-color: $c-bluegrey-dark;
border-bottom: 1px solid $c-darker-grey;
border-top-left-radius: 3px !important;
border-top-right-radius: 3px !important;

18
js/apps/system/_admin/aardvark/APP/frontend/scss/_modals.scss
View File

@ -486,8 +486,23 @@
}
.foxx-store-row {
border-bottom: 10px solid $c-white;
border-top: 10px solid $c-white;
.foxx-name {
font-weight: 700;
background: $c-bluegrey-dark;
border-radius: 4px;
color: $c-white;
font-weight: 300;
margin-bottom: 8px;
padding-bottom: 1px;
padding-left: 5px;
width: 100%;
}
.foxx-store-install {
padding-right: 5px;
padding-top: 25px;
}
.foxx-author {
@ -498,6 +513,7 @@
.foxx-version {
font-weight: 400;
margin-top: 25px;
}
}