commit c7b7835277198106a66c9cc1a28cede137c6a9e3
parent 27ee05c1c146e7cb8523ed41f5d0abd26dc68030
Author: Jan Dankert <devnull@localhost>
Date: Sun, 10 Dec 2017 01:00:09 +0100
Beim Auslesen des Formulars mit Jquery hat sich offenbar die Objektstruktur geändert.
Diffstat:
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/model/Value.class.php b/model/Value.class.php
@@ -134,7 +134,12 @@ class Value
* @type Boolean
*/
var $publish;
-
+
+ /**
+ * @type Boolean
+ */
+ public $simple;
+
/**
* Konstruktor
*/
@@ -557,7 +562,7 @@ SQL
$v->simple = $this->simple;
$v->element = $this->element;
$v->languageid = $this->languageid;
- $v->modelid = $this->modelid;
+ //$v->modelid = $this->modelid;
$v->load();
$v->generate();
$this->value = $v->value;
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -1097,7 +1097,7 @@ function createUrl(action,subaction,id,extraid)
{
url += '?0=0';
jQuery.each(extraid, function(name, field) {
- url = url + '&' + name + '=' + field;
+ url = url + '&' + field.name + '=' + field.value;
});
}
else
diff --git a/themes/default/js/openrat.min.js b/themes/default/js/openrat.min.js
@@ -14,6 +14,6 @@ else{d.moveStart('character',i.length+s.length+t.length)};d.select()}
else if(typeof a.selectionStart!='undefined'){var l=a.selectionStart,r=a.selectionEnd,s=a.value.substring(l,r);a.value=a.value.substr(0,l)+i+s+t+a.value.substr(r);var n;if(s.length==0){n=l+i.length}
else{n=l+i.length+s.length+t.length};a.selectionStart=n;a.selectionEnd=n}
else{n=a.value.length;var s=prompt('Text');a.value=a.value.substr(0,n)+i+s+t+a.value.substr(n)}};function loadSubaction(e,i,t,a){alert('nobody should call loadSubaction()');var n={skin:'v2',baseHref:OR_THEMES_EXT_DIR+'../editor/editor/',customConfig:'config-openrat.js',filebrowserUploadUrl:'./dispatcher.php?action=filebrowser&subaction=directupload&name=upload',filebrowserBrowseUrl:'./dispatcher.php?action=filebrowser&subaction=browse'};var s=$(e).parent().parent().parent('div.panel').children('div.content').first();$(s).load(createUrl(i,t,a)+' div.content',null,function(){var e=CKEDITOR.instances[$('textarea.editor').attr('name')];if(e)e.destroy();CKEDITOR.replace('text',{customConfig:'config-openrat.js'})});$(e).parent().parent().find('.active').removeClass('active');$(e).parent().addClass('active')};function createUrl(e,i,t,s){var a='./dispatcher.php';if(typeof s==='string'){a+='?action='+e+'&subaction='+i+'&id='+t;jQuery.each(jQuery.parseJSON(s),function(e,i){a=a+'&'+e+'='+i})}
-else if(typeof s==='object'){a+='?0=0';jQuery.each(s,function(e,i){a=a+'&'+e+'='+i})}
+else if(typeof s==='object'){a+='?0=0';jQuery.each(s,function(e,i){a=a+'&'+i.name+'='+i.value})}
else{a+='?action='+e+'&subaction='+i+'&id='+t};console.log('URL='+a);return a};function resizeWorkbenchContainer(e){var t=e.width(),a=e.height(),s=e.children('div.resizable').data('size-factor');if(!s)s=0.3;var n=e.hasClass('axle-x');if(n){var i=Math.floor(t*s);e.find('div.panel.resizable').css('width',''+i+'px');e.find('div.panel.resizable > div.content').css('height',''+(a-26)+'px');e.find('div.panel.autosize ').css('width',''+(t-i-9)+'px');e.find('div.panel.autosize > div.content').css('height',''+(a-26)+'px');e.children('div.resizable').css('width',''+i+'px');e.children('div.resizable').css('height',''+a+'px');e.children('div.autosize').css('width',''+(t-i-9)+'px');e.children('div.autosize').css('height',''+a+'px');e.children('div.divider').css('height',''+a+'px')}
else{var i=Math.floor(a*s);e.find('div.panel.resizable ').css('width',''+t+'px');e.find('div.panel.resizable > div.content').css('height',''+(i-26)+'px');e.find('div.panel.autosize ').css('width',''+t+'px');e.find('div.panel.autosize > div.content').css('height',''+(a-i-26)+'px');e.children('div.resizable').css('width',''+t+'px');e.children('div.resizable').css('height',''+i+'px');e.children('div.autosize').css('width',''+t+'px');e.children('div.autosize').css('height',''+(a-i-5)+'px');e.children('div.divider').css('width',''+t+'px')};e.children('div.panel').each(function(){resizeTabs($(this))});$(e).children('div.container').each(function(){resizeWorkbenchContainer($(this))})};function resizeWorkbench(){var i=$(window).width(),t=$(window).height(),a=40,e=$('div#workbench > div.container');e.css('width',''+(i-6)+'px');e.css('height',''+(t-a-6)+'px');resizeWorkbenchContainer(e)};function resizeTabs(e){var t=$(e).find('div.header li.action').size(),i=Math.floor((($(e).width()-18)/t)-39);if($(e).is('#panel-content'))i-=24;i=Math.min(90,Math.max(5,i));$(e).find('li.action div.tabname').width(i)};function help(e,i,t){var a=$(e).closest('div.panel').find('li.action.active').attr('data-action'),s=$(e).closest('div.panel').find('li.action.active').attr('data-method');window.open(i+a+'/'+s+t,'OpenRat_Help','location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes')};function notify(e,i){var t=$('<div class="notice '+e+'"><div class="text">'+i+'</div></div>');$('#noticebar').prepend(t);notifyBrowser(i);$(t).fadeIn().click(function(){$(this).fadeOut('fast',function(){$(this).remove()})})};
\ No newline at end of file
