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

Merge pull request #3304 from alchemy-fr/PHRAS-2719_Edit_form_unable_to_select_value_in_mutivalue_field

Browse Source 
PHRAS-2719 #comment merge Edit form : Unable to select a value in a multivalued field
This commit is contained in:
Nicolas Maillat
2020-01-24 13:55:01 +01:00
committed by GitHub
parent d652d29f31 0e6f42e400
commit 51bf756d87
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.106-d",
"phraseanet-production-client": "0.34.111-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

11
templates/web/prod/actions/edit_default.html.twig
View File

@@ -41,7 +41,7 @@
<div style='position:absolute; top:0px; left:0px; height:20px'>
<img class="require_alert" src="/assets/common/images/icons/alert.png" style="display:none;cursor:help;" title="{{ 'edit::Certains champs doivent etre remplis pour valider cet editing' | trans }}">
</div>
<div style='position:absolute; bottom:0px; left:0px; height:20px' class="bottom actions">
<div style='position:absolute; bottom:7px; left:8px; height:20px' class="bottom actions">
<span class="fa-stack previewTips"
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
@@ -73,9 +73,9 @@
</tbody>
</table>
</div>
<div class="editDiaButtons" style="position:absolute; bottom:0px; right:0px; width:30px; height:12px; display:none">
<img id="idEditDiaButtonsP_{{i}}" style="cursor:pointer" src="/assets/common/images/icons/plus11.png"/>
<img id="idEditDiaButtonsM_{{i}}" style="cursor:pointer" src="/assets/common/images/icons/minus11.png"/>
<div class="editDiaButtons" style="position:absolute; bottom:8px; right:3px; width:30px; display:none">
<span id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="fa fa-plus editIcon">&nbsp;</i></span>
<span id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="fa fa-minus editIcon">&nbsp;</i></span>
</div>
</div>
{% endmacro %}
@@ -198,7 +198,7 @@
</div>
<div style="position:absolute; top:4px; width:60px; right:6px; height:24px;">
<button type="submit" class="submit-multivalued">
<img id="EditButAddMultiValued" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
<i id="EditButAddMultiValued" class="icon-round-add_box-24px icomoon" style="font-size: 24px;color: grey;">&nbsp;</i>
</button>
</div>
</form>
@@ -477,4 +477,5 @@
{% endfor %}
]
};
</script>

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.106-d:
version "0.34.106-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.106-d.tgz#020379df0fc6023eebd5e188c7047b2e83892070"
integrity sha512-Z8XPVe++0oQ6LYubGMHovOhJg1qbSPoCyAD0HMazmtg+TzklfNcvPmUKWxKev2mP9qMLwYr5h4ts7XueyangAQ==
phraseanet-production-client@0.34.111-d:
version "0.34.111-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.111-d.tgz#e0b4e5d92b12c9920db4d0271c5728c2fd950106"
integrity sha512-MXDDDaiyv+5acl9w4IqihFZaLaYGgK3UNZAYIcw7O/lfvUEOG7KmxOw/w7mC6uN/5YCuN45KILC/5zPYzNIH6w==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"