Merge pull request #157 from FriendsOfREDAXO/cb-yform-liste

Form-Linkliste repariert
FriendsOfREDAXO · Jan 3, 2025 · 5329022 · 5329022
2 parents 51ae211 + 8d83526
commit 5329022
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 # MarkItUp Changelog
 
-## [4.0.0] Work in Progress
+## [4.0.1](https://github.com/FriendsOfREDAXO/markitup/releases/tag/4.0.1) - 03.01.2024
 
+- Bugfix beim Einbinden von YForm-Links; Die Auswahlliste wurde nach einer YForm-Änderung nicht mehr angzeigt
+
 - Abschluß der Umstellung auf Namespace; als "deprecated" markierte Elemte entfernt
   - Funktionen:
     - `markitup_cache_update()` => `FriendsOfRedaxo\MarkItUp\Cache::update`

diff --git a/assets/scripts.js b/assets/scripts.js
@@ -43,14 +43,9 @@ function markitupYformConnectionCreate( container ) {
     return $yform;
 }
 
-function markitupYformOpen( id, tablename, data_id ){
-    newWindow(
-        'y'+id,
-        'index.php?page=yform/manager/data_edit&table_name='+tablename+'&rex_yform_manager_popup=1&func=edit&data_id='+data_id,
-        1200,
-        Math.max(screen.height*0.75,800),
-//        ',status=no,resizable=yes,nav=no'
-    );
+function markitupYformOpen( id, targetfield, url ){
+	let newWindowLink = url + '&rex_yform_manager_opener[id]='+id+'&rex_yform_manager_opener[field]='+targetfield+'&rex_yform_manager_opener[multiple]=0';
+	return newWindow( id, newWindowLink, 1200,800,',status=yes,resizable=yes');
 }
 
 //Start - functions for markdown
@@ -192,7 +187,7 @@ function markitupYformOpen( id, tablename, data_id ){
             markitup._yform['yform'] = $yform;
         }
         $yform.done = false;
-        var dokument = openYFormDataset($yform.id, table+'.id', 'index.php?page=yform/manager/data_edit&table_name='+table );
+        var dokument = markitupYformOpen($yform.id, table+'.id', 'index.php?page=yform/manager/data_edit&table_name='+table );
 
         $(dokument).on('rex:YForm_selectData', function (event, id) {
             event.preventDefault();
@@ -371,7 +366,7 @@ function markitupYformOpen( id, tablename, data_id ){
             markitup._yform[table] = $yform;
         }
         $yform.done = false;
-        var dokument = openYFormDataset($yform.id, table+'.id', 'index.php?page=yform/manager/data_edit&table_name='+table );
+        var dokument = markitupYformOpen($yform.id, table+'.id', 'index.php?page=yform/manager/data_edit&table_name='+table );
 
         $(dokument).on('rex:YForm_selectData', function (event, id) {
             event.preventDefault();

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: markitup
-version: '4.0.0'
+version: '4.0.1'
 author: Friends Of REDAXO
 supportpage: github.com/FriendsOfREDAXO/markitup