hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3620-admin-subview-bad-path

Browse Source
This commit is contained in:
Nicolas Maillat
2022-01-12 10:03:21 +01:00
committed by GitHub
parent 1d3f9a73be b7a1b383f2
commit bf4e7aba9a
19 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Phraseanet-production-client/config/config.js
View File

@@ -13,5 +13,5 @@ module.exports = {
setupDir: _root + 'tests/setup/node.js',
karmaConf: _root + 'config/karma.conf.js',
// change this version when you change JS file for lazy loading
assetFileVersion: 36
assetFileVersion: 37
};

2
Phraseanet-production-client/dist/authenticate.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=36";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=37";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/authenticate.min.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=36";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=37";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=36";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=37";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.min.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=36";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=37";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

7
Phraseanet-production-client/dist/production.js vendored
View File

@@ -19299,6 +19299,7 @@ var notifyLayout = function notifyLayout(services) {
$notificationDialog.dialog('close');
};
var zIndexOverlay = (0, _jquery2.default)('.ui-widget-overlay').css("z-index");
// open the dlg (even if it is already opened when "load more")
//
$notificationDialog.dialog({
@@ -19310,11 +19311,16 @@ var notifyLayout = function notifyLayout(services) {
modal: true,
width: 500,
height: 400,
dialogClass: "dialog-notification-box",
overlay: {
backgroundColor: '#000',
opacity: 0.7
},
open: function open() {
(0, _jquery2.default)('.ui-widget-overlay').css("z-index", (0, _jquery2.default)(".dialog-notification-box").css("z-index"));
},
close: function close(event, ui) {
(0, _jquery2.default)('.ui-widget-overlay').css("z-index", zIndexOverlay);
// destroy so it will be "fresh" on next open (scrollbar on top)
$notificationDialog.dialog('destroy').remove();
}
@@ -51110,7 +51116,6 @@ var geonameDatasource = function geonameDatasource(services) {
height: "auto",
width: 400,
modal: true,
dialogClass: "dialog-edit_lat_lon",
buttons: {
confirmYes: function confirmYes() {
(0, _jquery2.default)(this).dialog("close");

7
Phraseanet-production-client/dist/production.min.js vendored
View File

@@ -19299,6 +19299,7 @@ var notifyLayout = function notifyLayout(services) {
$notificationDialog.dialog('close');
};
var zIndexOverlay = (0, _jquery2.default)('.ui-widget-overlay').css("z-index");
// open the dlg (even if it is already opened when "load more")
//
$notificationDialog.dialog({
@@ -19310,11 +19311,16 @@ var notifyLayout = function notifyLayout(services) {
modal: true,
width: 500,
height: 400,
dialogClass: "dialog-notification-box",
overlay: {
backgroundColor: '#000',
opacity: 0.7
},
open: function open() {
(0, _jquery2.default)('.ui-widget-overlay').css("z-index", (0, _jquery2.default)(".dialog-notification-box").css("z-index"));
},
close: function close(event, ui) {
(0, _jquery2.default)('.ui-widget-overlay').css("z-index", zIndexOverlay);
// destroy so it will be "fresh" on next open (scrollbar on top)
$notificationDialog.dialog('destroy').remove();
}
@@ -51110,7 +51116,6 @@ var geonameDatasource = function geonameDatasource(services) {
height: "auto",
width: 400,
modal: true,
dialogClass: "dialog-edit_lat_lon",
buttons: {
confirmYes: function confirmYes() {
(0, _jquery2.default)(this).dialog("close");

6
Phraseanet-production-client/dist/skin-000000.css vendored
View File

@@ -3430,8 +3430,8 @@ h3.metadatas-title:after {
z-index: 1999;
}
.ui-dialog.ui-widget-content.dialog-edit_lat_lon {
z-index: 2000 !important;
.ui-dialog.ui-widget-content.dialog-notification-box {
z-index: 1199 !important;
}
.ui-dialog-titlebar {
@@ -8854,7 +8854,7 @@ TABLE.explain3 TR TD {
#PREVIEWBOX,
#EDITWINDOW {
z-index: 2000;
z-index: 1200;
background-color: #1a1a1a;
display: none;
border: 1px solid #7f7f7f;

2
Phraseanet-production-client/dist/skin-000000.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
Phraseanet-production-client/dist/skin-959595.css vendored
View File

@@ -3445,8 +3445,8 @@ h3.metadatas-title:after {
z-index: 1999;
}
.ui-dialog.ui-widget-content.dialog-edit_lat_lon {
z-index: 2000 !important;
.ui-dialog.ui-widget-content.dialog-notification-box {
z-index: 1199 !important;
}
.ui-dialog-titlebar {
@@ -8869,7 +8869,7 @@ TABLE.explain3 TR TD {
#PREVIEWBOX,
#EDITWINDOW {
z-index: 2000;
z-index: 1200;
background-color: #d9d9d9;
display: none;
border: 1px solid silver;

2
Phraseanet-production-client/dist/skin-959595.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
Phraseanet-production-client/dist/skin-FFFFFF.css vendored
View File

@@ -3447,8 +3447,8 @@ h3.metadatas-title:after {
z-index: 1999;
}
.ui-dialog.ui-widget-content.dialog-edit_lat_lon {
z-index: 2000 !important;
.ui-dialog.ui-widget-content.dialog-notification-box {
z-index: 1199 !important;
}
.ui-dialog-titlebar {
@@ -8871,7 +8871,7 @@ TABLE.explain3 TR TD {
#PREVIEWBOX,
#EDITWINDOW {
z-index: 2000;
z-index: 1200;
background-color: #ffffff;
display: none;
border: 1px solid #bfbfbf;

2
Phraseanet-production-client/dist/skin-FFFFFF.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
Phraseanet-production-client/src/components/notify/notifyLayout.js
View File

@@ -103,6 +103,7 @@ const notifyLayout = (services) => {
$notificationDialog.dialog('close');
};
let zIndexOverlay = $('.ui-widget-overlay').css("z-index");
// open the dlg (even if it is already opened when "load more")
//
$notificationDialog
@@ -116,11 +117,16 @@ const notifyLayout = (services) => {
modal: true,
width: 500,
height: 400,
dialogClass: "dialog-notification-box",
overlay: {
backgroundColor: '#000',
opacity: 0.7
},
open: function () {
$('.ui-widget-overlay').css("z-index", $(".dialog-notification-box").css("z-index"));
},
close: function (event, ui) {
$('.ui-widget-overlay').css("z-index", zIndexOverlay);
// destroy so it will be "fresh" on next open (scrollbar on top)
$notificationDialog.dialog('destroy').remove();
}

1
Phraseanet-production-client/src/components/record/recordEditor/plugins/geonameDatasource.js
View File

@@ -128,7 +128,6 @@ const geonameDatasource = (services) => {
height: "auto",
width: 400,
modal: true,
dialogClass: "dialog-edit_lat_lon",
buttons: {
confirmYes : function () {
$(this).dialog("close");

5
Phraseanet-production-client/src/skins/style/ui-components/_jquery-ui.scss
View File

@@ -233,8 +233,9 @@ $basketBg: $darkBackgroundColor !default;
z-index: 1999;
}
.ui-dialog.ui-widget-content.dialog-edit_lat_lon {
z-index: 2000 !important;
.ui-dialog.ui-widget-content.dialog-notification-box {
// just less than the PREVIEWBOX and the EDITWINDOW z-index
z-index: 1199 !important;
}
.ui-dialog-titlebar {

2
Phraseanet-production-client/src/skins/style/ui-components/_modal-preview.scss
View File

@@ -1,6 +1,6 @@
#PREVIEWBOX,
#EDITWINDOW {
z-index: 2000; // just enough uppur than a dialog z-index
z-index: 1200;
background-color: $modalBackground;
display: none;
border: $modalBorder; //1px solid $darkerBorderColor;

2
lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
View File

@@ -59,7 +59,7 @@ class PhraseanetExtension extends \Twig_Extension
{
return [
// change this version when you change JS file to force the navigation to reload js file
'assetFileVersion' => 36
'assetFileVersion' => 37
];
}

4
lib/classes/record/adapter.php
View File

@@ -2159,8 +2159,12 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
$this->app['filesystem']->remove($ftodel);
// delete cache of subdefs
$this->delete_data_from_cache(self::CACHE_SUBDEFS);
// delete the corresponding key record_id from the cache
$this->delete_data_from_cache();
$this->dispatch(RecordEvents::DELETED, new DeletedEvent($this));
return array_keys($ftodel);