Author: nathangray
New Revision: 52277
URL: http://svn.stylite.de/viewvc/egroupware?rev=52277&view=rev
Log:
Fix select options with ${row} were not always found
Modified:
branches/14.2/etemplate/ (props changed)
branches/14.2/etemplate/js/et2_widget_selectbox.js
Propchange: branches/14.2/etemplate/
— svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 22:54:41 2015
@@ -1,1 +1,1 @@
-/trunk/etemplate:51364,51378,51382,51385,51389,51391,51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907,51929,51933,51943,51948,51950-51951,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52258,52262
+/trunk/etemplate:51364,51378,51382,51385,51389,51391,51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907,51929,51933,51943,51948,51950-51951,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52258,52262,52276
Modified: branches/14.2/etemplate/js/et2_widget_selectbox.js
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/js/et2_widget_selectbox.js?rev=52277&r1=52276&r2=52277&view=diff
— branches/14.2/etemplate/js/et2_widget_selectbox.js (original)
+++ branches/14.2/etemplate/js/et2_widget_selectbox.js Wed Mar 25 22:54:41 2015
@@ -815,20 +815,17 @@
// Maybe in a row, and options got stuck in ${row} instead of top level
// not sure this code is still needed, as server-side no longer creates ${row} or {$row} for select-options
-
if(!content_options || content_options.length == 0) -
{ -
var row_stuck = ['${row}','{$row}']; -
for(var i = 0; i < row_stuck.length; i++) -
{ -
// perspectiveData.row in nm, data["${row}"] in an auto-repeat grid -
if(widget.getArrayMgr("sel_options").perspectiveData.row || widget.getArrayMgr("sel_options").data[row_stuck[i]])
-
var row_stuck = ['${row}','{$row}']; -
for(var i = 0; i < row_stuck.length && (!content_options || content_options.length == 0); i++) -
{ -
// perspectiveData.row in nm, data["${row}"] in an auto-repeat grid -
if(widget.getArrayMgr("sel_options").perspectiveData.row || widget.getArrayMgr("sel_options").data[row_stuck[i]]) -
{ -
var row_id = widget.id.replace(/[0-9]+/,row_stuck[i]); -
content_options = widget.getArrayMgr("sel_options").getEntry(row_id); -
if(!content_options || content_options.length == 0) {
-
var row_id = widget.id.replace(/[0-9]+/,row_stuck[i]); -
content_options = widget.getArrayMgr("sel_options").getEntry(row_id); -
if(!content_options || content_options.length == 0) -
{ -
content_options = widget.getArrayMgr("sel_options").getEntry(row_stuck[i] + '[' + widget.id + ']'); -
}
-
content_options = widget.getArrayMgr("sel_options").getEntry(row_stuck[i] + '[' + widget.id + ']'); } } }
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs