Menu
▾
▴
[eGroupWare-svn] r54997 - in /branches/14.2/etemplate: ./ js/et2_widget_grid.js
|
From: <ral...@us...> - 2016-02-13 16:26:20
|
Author: ralfbecker Date: Sat Feb 13 17:26:13 2016 New Revision: 54997 URL: http://svn.stylite.de/viewvc/egroupware?rev=54997&view=rev Log: fixed not detected number of autorepeated rows for id like "${row}@[name]" addressing first column, gave error "Problem in autorepeat fallback: too many rows" Modified: branches/14.2/etemplate/ (props changed) branches/14.2/etemplate/js/et2_widget_grid.js Propchange: branches/14.2/etemplate/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 13 17:26:13 2016 @@ -1,1 +1,1 @@ -/trunk/etemplate:51364,51378,51382,51385,51389,51391,51397-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,51757,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907-51908,51929,51933,51943,51948,51950-51951,51953,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52192,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52255,52258,52261-52262,52268,52275-52276,52278,52282,52285-52286,52296,52307,52321,52330,52334-52336,52340-52341,52353-52355,52357,52360,52368,52372-52373,52375,52379,52385,52406,52412,52423,52440,52447,52449,52455,52460,52470,52472,52477,52482,52487,52492,52495-52496,52510,52514,52519,52524,52555,52570,52 573-52574,52583,52610,52624,52627,52635,52664,52667,52688,52690,52696,52698,52708,52713,52718,52720,52726,52728,52732,52734,52749,52753,52778,52787-52788,52790,52804-52806,52819,52832,52842,52844,52851,52914,52920,52946,52982,53008-53009,53021-53022,53024,53061,53082,53103,53109,53135,53169-53170,53182,53203,53205,53207-53209,53211,53231,53252,53327-53328,53333,53341,53348,53354,53376,53381,53397,53421,53440,53494,53498,53522,53527,53607,53615,53626,53690,53705,53707-53709,53712-53713,53716,53726,53730-53732,53741,53759-53760,53773,53797,53819,53821-53822,53846,53854,53869,53887,53916,53926,53933,53935,53942,53945,53960,53981,53983,53991,53999,54040,54048,54090,54136,54165,54182,54196,54210,54252,54388,54443,54466,54468,54655,54664,54668,54670,54674,54677,54782,54795-54797,54822,54894 +/trunk/etemplate:51364,51378,51382,51385,51389,51391,51397-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,51757,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907-51908,51929,51933,51943,51948,51950-51951,51953,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52192,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52255,52258,52261-52262,52268,52275-52276,52278,52282,52285-52286,52296,52307,52321,52330,52334-52336,52340-52341,52353-52355,52357,52360,52368,52372-52373,52375,52379,52385,52406,52412,52423,52440,52447,52449,52455,52460,52470,52472,52477,52482,52487,52492,52495-52496,52510,52514,52519,52524,52555,52570,52 573-52574,52583,52610,52624,52627,52635,52664,52667,52688,52690,52696,52698,52708,52713,52718,52720,52726,52728,52732,52734,52749,52753,52778,52787-52788,52790,52804-52806,52819,52832,52842,52844,52851,52914,52920,52946,52982,53008-53009,53021-53022,53024,53061,53082,53103,53109,53135,53169-53170,53182,53203,53205,53207-53209,53211,53231,53252,53327-53328,53333,53341,53348,53354,53376,53381,53397,53421,53440,53494,53498,53522,53527,53607,53615,53626,53690,53705,53707-53709,53712-53713,53716,53726,53730-53732,53741,53759-53760,53773,53797,53819,53821-53822,53846,53854,53869,53887,53916,53926,53933,53935,53942,53945,53960,53981,53983,53991,53999,54040,54048,54090,54136,54165,54182,54196,54210,54252,54388,54443,54466,54468,54655,54664,54668,54670,54674,54677,54782,54795-54797,54822,54894,54996 Modified: branches/14.2/etemplate/js/et2_widget_grid.js URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/js/et2_widget_grid.js?rev=54997&r1=54996&r2=54997&view=diff ============================================================================== --- branches/14.2/etemplate/js/et2_widget_grid.js (original) +++ branches/14.2/etemplate/js/et2_widget_grid.js Sat Feb 13 17:26:13 2016 @@ -288,7 +288,7 @@ var ident = content.expandName(value); // expandName() handles index into content (@), but we have to look up // regular values - if(value.indexOf('@') < 0) + if(value[0] != '@') { // Returns null if there isn't an actual value ident = content.getEntry(ident,false,true); @@ -298,7 +298,7 @@ rowData[rowIndex] = jQuery.extend({}, rowDataEntry); content.perspectiveData.row = ++rowIndex; ident = content.expandName(value); - if(value.indexOf('@') < 0) + if(value[0] != '@') { // Returns null if there isn't an actual value ident = content.getEntry(ident,false,true); |