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

PHRAS-3999: admin - databases - subdefinition - error 400 and 500 when create subdefinition (#4452)

Browse Source 
* fix subdef creation

* add default background color in preset
This commit is contained in:
Aina Sitraka
2023-12-22 16:51:36 +03:00
committed by GitHub
parent 03d129a329
commit 0ccd109196
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
View File

@@ -253,6 +253,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "jpeg", Image::OPTION_ICODEC => "jpeg",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"320 px JPG (thumbnail Phraseanet)" => [ "320 px JPG (thumbnail Phraseanet)" => [
@@ -262,6 +263,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "jpeg", Image::OPTION_ICODEC => "jpeg",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"640px JPG" => [ "640px JPG" => [
@@ -271,6 +273,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "jpeg", Image::OPTION_ICODEC => "jpeg",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"1280px JPG (preview Phraseanet)" => [ "1280px JPG (preview Phraseanet)" => [
@@ -280,6 +283,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "jpeg", Image::OPTION_ICODEC => "jpeg",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"2560px JPG" => [ "2560px JPG" => [
@@ -289,6 +293,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "jpeg", Image::OPTION_ICODEC => "jpeg",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"PNG" => null, "PNG" => null,
@@ -299,6 +304,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "png", Image::OPTION_ICODEC => "png",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"320px PNG 8 bits" => [ "320px PNG 8 bits" => [
@@ -308,6 +314,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "png", Image::OPTION_ICODEC => "png",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"640px PNG 8 bits" => [ "640px PNG 8 bits" => [
@@ -317,6 +324,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "png", Image::OPTION_ICODEC => "png",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"1280px PNG 8 bits" => [ "1280px PNG 8 bits" => [
@@ -326,6 +334,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "png", Image::OPTION_ICODEC => "png",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"2560px PNG 8 bits" => [ "2560px PNG 8 bits" => [
@@ -335,6 +344,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "png", Image::OPTION_ICODEC => "png",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"TIFF" => null, "TIFF" => null,
@@ -345,6 +355,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "tiff", Image::OPTION_ICODEC => "tiff",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"2560px TIFF" => [ "2560px TIFF" => [
@@ -354,6 +365,7 @@ class SubdefsController extends Controller
Image::OPTION_FLATTEN => "yes", Image::OPTION_FLATTEN => "yes",
Image::OPTION_QUALITY => "75", Image::OPTION_QUALITY => "75",
Image::OPTION_ICODEC => "tiff", Image::OPTION_ICODEC => "tiff",
Image::OPTION_BACKGROUNDCOLOR => "",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
], ],

6
templates/web/admin/subdefs.html.twig
View File

@@ -377,7 +377,7 @@
<label for="subviewType">{{ 'create_subdef_modal_record_phraseanet_type' | trans }}</label> <label for="subviewType">{{ 'create_subdef_modal_record_phraseanet_type' | trans }}</label>
<div class="selectdiv"> <div class="selectdiv">
<select name="subviewType" id="subviewType" onchange="subview_type(this)"> <select name="subviewType" id="subviewType" onchange="subview_type(this)">
<option>{{ 'Choisir' | trans }}</option> <option value="Choose">{{ 'Choisir' | trans }}</option>
<option value="image">{{ 'image' | trans }}</option> <option value="image">{{ 'image' | trans }}</option>
<option value="video">{{ 'video' | trans }}</option> <option value="video">{{ 'video' | trans }}</option>
<option value="audio">{{ 'audio' | trans }}</option> <option value="audio">{{ 'audio' | trans }}</option>
@@ -388,13 +388,13 @@
<label for="mediaType">{{ 'create_subdef_modal_preview_mediatype' | trans }}</label> <label for="mediaType">{{ 'create_subdef_modal_preview_mediatype' | trans }}</label>
<div class="selectdiv"> <div class="selectdiv">
<select name="mediaType" id="mediaType" onchange="media_type(this)"> <select name="mediaType" id="mediaType" onchange="media_type(this)">
<option>{{ 'Choisir' | trans }}</option> <option value="Choose">{{ 'Choisir' | trans }}</option>
</select> </select>
</div> </div>
<label for="presets">{{ 'create_subdef_modal_presets' | trans }}</label> <label for="presets">{{ 'create_subdef_modal_presets' | trans }}</label>
<div class="selectdiv"> <div class="selectdiv">
<select name="presets" id="presets"> <select name="presets" id="presets">
<option>{{ 'Choisir' | trans }}</option> <option value="Choose">{{ 'Choisir' | trans }}</option>
</select> </select>
</div> </div>
<label for="subviewPath">{{ 'Path' | trans }}</label> <label for="subviewPath">{{ 'Path' | trans }}</label>