From 89562413d498747e6f3f2cec9b2bb02683981aab Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 25 Sep 2015 11:29:10 +0200 Subject: [PATCH] =?utf8?q?tried=20to=20fix=20problem=20in=20admin=20area?= =?utf8?q?=20where=20no=20parent=20category=20shall=20be=20selectable.=20m?= =?utf8?q?aybe=20drop=20the=20fake=20category=20thing=3F=20Signed-off-by:R?= =?utf8?q?oland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcoreee.jar | Bin 17745 -> 17745 bytes lib/jshop-core.jar | Bin 46076 -> 46076 bytes lib/jshop-ee-lib.jar | Bin 7308 -> 7308 bytes .../beans/shop/ShopWebBean.java | 13 +++++++------ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 1b1ad2a1e6da411ce125c30ebcb4f0de5b875363..37a902e7e287344bf9e0d02609a517bc832822dc 100644 GIT binary patch delta 369 zcmccE#dxuckte{LnT3mifrEj;H+mwECX-L}MDyuPK=uU%5cx?HNKTezGz3urjMgBk zm(c-4ooDm|QSwYq5T4=W04DZHx;!XG0;LTnuXACa{F;dir0hGBhoEn?rF%!(Y9#>{ z1_lsTpZrlCR0PuMDyuPK=uU%5cx?HNKTezGz3urjMgBk zm(c-4ooDm|QSwYq5T4=W04DZHx;!XG0;LTnuXACa{F;dir0hGBhhSrnr90ErubBcY z3=ANwKKY}z#N<7!Jey0H-!U;VY))n~WCSYSJdOP<2Z&A;n8X93f6Az_f@nph{hT2B zk@g!F5PiX*5v(rQ@*jvlIoQq;=#R;Lc3^j2urmM>B>#C|i3+5Y=Gs4WiE42Y@Jf zhd2;b?+^sx$xMFl0QObAgUn=qM>CLUyJG|g%;l4xJNkme%$!m{)EuWQ5XIr#2%@^3 UGeOih=W-C0?~)Co?zof!0PmJ~Y69YaCLOLrD~+h_WqZ9db%JY)H+vtKkDYSsEP6TS@>ydVOGtvX!03_0i@{m+gyQHH#M4yaJ;GI}Nq0j;*g+>q% z>Jp2pCX}SWblo6)WQyptAC5b;!w_DalJZi9N0`gCP$N=hk2*?jx>JQaP_`3c@jpD)SNhv}xrjM<&18Hx9H zA@zDYkdC}PAnqMNdEm>ZqrRHttrf(5-N54S2Ydcr@agZwQcYkH1Osy*FE|Uff-b;^ zmceRh34Dbn!C=@9Zo@VpM_5{mj3a$SCP4e89bX7svW4s@ORlH`yI%ut5DgVTb=m_ln&XS delta 613 zcmXBQ%PT}t90%}w&!xsZj7RF`Q4&QdqDDg*kH#Z~nJ!t#dpsjzh%DGDY1|q$9*N9* z#+WHd@*jw#Y{=|xHlw6$EX?;eoAWu}@9&(mIDZQJQ<%25OGs05oQmV(l0#d;-X%xf z0ZZbVPQ@1R!Azi7FoP+f8Tf^U zBr!!OOM{uJ0S2el5_zwU3&^Kgt27t$UMMF-h32mXc{6>4y4xdp@1( z-_FTEKf7~H^Agt#&3BK_)6v(QpWt2j`NEj|Kw0OepXqT|quh4Wcip*Lk$6uxuy{Jb zk*60VJpI7sEtJQ+hSb(d18)y7`TBs=7GgZxK4#ay5i>mV!m8oQ~3w$0*IJ KVsy_DoBIca?f=;T diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index f7b46945b71a7856e88a5b0c3cd0c244871e3c6c..fd9eff88281d61484ea708bcc35363f55d3fd80b 100644 GIT binary patch delta 328 zcmeCN?6Kqt@MdP=VqoB4V91P~$fL=W5k1j-Iunq6K>7PhKF%fnv*MRpuNfpycMsteIf?ANxB- z5dR(L8Zdtj&oeOH!v7j9UMR@V43cjW;Q;X`_lQ~oojLiqDA*aCVg?{VYca6f%EX*O zyxn4+Ac{>q07ONIhk>XK;z1BfX0n2W8Hl-BLS}M_geim>2%`Q;R5IWI(Iunq6K>7PhKF%fnv*MRpuNfpycMsteIf?ANxB- z5dR(L8Zdtj&oeOH!v7j9UMR@V43cjW;Q;X`_lQ~oojLiqDA*aCVg?{VYca6f%EX*O zyxn4+Ac{>q07ONIhk>XK;z1BfX0n2W8Hl-BLS}M_geim>2%`Q; getAllCategoriesParent () throws FaceletException { // Get regular list - List deque = new LinkedList<>(); + List list = new LinkedList<>(); - // Create fake entry - Category fake = new ProductCategory(0L, this.getMessageStringFromKey("ADMIN_CATEGORY_HAS_NO_PARENT"), null); //NOI18N + // Create null category + Category nullCategory = new ProductCategory(); + nullCategory.setCategoryTitle(this.getMessageStringFromKey("ADMIN_CATEGORY_HAS_NO_PARENT")); //NOI18N // Add it - deque.add(fake); + list.add(nullCategory); // Add all - deque.addAll(this.getAllCategories()); + list.addAll(this.getAllCategories()); // Return it - return deque; + return list; } @Override -- 2.39.5