Skip to content

Commit e8fbb98

Browse files
leedavileedavi
committed
Merge branch 'develop'
2 parents 37f6919 + 75bb391 commit e8fbb98

17 files changed

+159
-71
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,3 +249,4 @@ Installation/OpenStore_4.1.4_Upgrade.zip
249249
Installation/OpenStore_4.1.4_Upgate.zip
250250
Installation/OpenStore_4.1.4_Upgrade-OLD.zip
251251
dnnpack.config
252+
*.zip

‎App_LocalResources/Notification.ascx.nl-NL.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<value>De bestelling is geannuleerd, of de betaling is mislukt. Controleer uw bankgegevens of neem contact op met ons op als u denkt dat het probleem bij ons zit.</value>
146146
</data>
147147
<data name="checkoutsuccessmessage.Text" xml:space="preserve">
148-
<value>Dank voor uw bestelling. U ontvangt per e-mail een bevestiging met alle informatie. Controleer uw ongewenste e-mail als u na 30 minuten nog niets ontvangen heeft. Indien u contact met ons opneemt vernemen wij graag uw ordernummer.</value>
148+
<value>Dank voor uw bestelling. U ontvangt per e-mail een bevestiging met alle informatie. Controleer uw ongewenste e-mail als u na 30 minuten nog niets ontvangen heeft. Indien u contact met ons opneemt vernemen wij graag uw bestelnummer.</value>
149149
</data>
150150
<data name="Collection.Text" xml:space="preserve">
151151
<value>Details van de bestelling</value>

‎App_LocalResources/OrderAdmin.ascx.nl-NL.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<value xml:space="preserve">Kwitantie</value>
101101
</data>
102102
<data name="PaymentMethod.Text">
103-
<value xml:space="preserve">Betalingsmethode: </value>
103+
<value xml:space="preserve">Betaalmethode: </value>
104104
</data>
105105
<data name="PaymentStatus.Text" lastModified="2014-11-29 13:56:22">
106106
<value xml:space="preserve">Status betaling</value>

‎App_LocalResources/ProductView.ascx.nl-NL.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,4 +333,10 @@
333333
&lt;i class="fa fa-star fa-stack-1x fa-inverse"&gt;&lt;/i&gt;
334334
&lt;/span&gt;</value>
335335
</data>
336+
<data name="article.Text" xml:space="preserve">
337+
<value>artikel</value>
338+
</data>
339+
<data name="articles.Text" xml:space="preserve">
340+
<value>artikelen</value>
341+
</data>
336342
</root>

‎App_LocalResources/plugins.ascx.nl-NL.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<value>&lt;i class="fa fa-bar-chart-o fa-fw"&gt;&lt;/i&gt;</value>
128128
</data>
129129
<data name="assembly.Text" xml:space="preserve">
130-
<value>Vergadering</value>
130+
<value>Assembly</value>
131131
</data>
132132
<data name="bomenuattributes.Text" xml:space="preserve">
133133
<value>class="nav main-menu"</value>

‎App_LocalResources/settings.ascx.nl-NL.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<value>Fiscale codeveld</value>
146146
</data>
147147
<data name="copyorderto.Text" xml:space="preserve">
148-
<value>Kopiëren van bestelling naar E-mail</value>
148+
<value>Kopie van bestelling naar e-mail</value>
149149
</data>
150150
<data name="currencysymbol.Text" xml:space="preserve">
151151
<value>Valutasymbool</value>

‎Components/NBrightBuyUtils.cs‎

Lines changed: 65 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,6 +1549,7 @@ public static string RazorTemplRenderList(string razorTemplName, int moduleid, s
15491549
return RazorTemplRenderList(razorTemplName, moduleid, cacheKey, objList, templateControlPath, theme, lang, settings, null);
15501550
}
15511551

1552+
private static string lockobjectRazorTemplRenderList = "lockitRazorTemplRenderList";
15521553
public static string RazorTemplRenderList(string razorTemplName, int moduleid, string cacheKey, List<NBrightInfo> objList, string templateControlPath, string theme, string lang, Dictionary<string, string> settings, NBrightInfo headerData)
15531554
{
15541555
// do razor template
@@ -1560,51 +1561,59 @@ public static string RazorTemplRenderList(string razorTemplName, int moduleid, s
15601561
var razorTempl = (string)GetModCache(ckey);
15611562
if (razorTempl == null || StoreSettings.Current.DebugMode)
15621563
{
1563-
razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
1564-
if (razorTempl != "")
1564+
lock (lockobjectRazorTemplRenderList)
15651565
{
1566-
var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
1567-
nbRazor.ModuleId = moduleid;
1568-
nbRazor.FullTemplateName = theme + "." + razorTemplName;
1569-
nbRazor.TemplateName = razorTemplName;
1570-
nbRazor.ThemeFolder = theme;
1571-
nbRazor.Lang = lang;
1572-
1573-
nbRazor.HeaderData = headerData;
1574-
1575-
var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
1576-
razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
1577-
if (cacheKey != "") SetModCache(moduleid, ckey, razorTempl); // only save to cache if we pass in a cache key.
1566+
razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
1567+
if (razorTempl != "")
1568+
{
1569+
var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
1570+
nbRazor.ModuleId = moduleid;
1571+
nbRazor.FullTemplateName = theme + "." + razorTemplName;
1572+
nbRazor.TemplateName = razorTemplName;
1573+
nbRazor.ThemeFolder = theme;
1574+
nbRazor.Lang = lang;
1575+
1576+
nbRazor.HeaderData = headerData;
1577+
1578+
var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
1579+
razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
1580+
if (cacheKey != "") SetModCache(moduleid, ckey, razorTempl); // only save to cache if we pass in a cache key.
1581+
}
15781582
}
15791583
}
15801584
return razorTempl;
15811585
}
15821586

1587+
private static string lockobjectRenderGroupCategoryList = "lockitRenderGroupCategoryList";
15831588
public static string RazorTemplRenderGroupCategoryList(string razorTemplName, int moduleid, string cacheKey, List<GroupCategoryData> objList, string templateControlPath, string theme, string lang, Dictionary<string, string> settings)
15841589
{
15851590
// do razor template
15861591
var cachekey = "NBrightBuyRazorOutputGrp" + theme + razorTemplName + "*" + cacheKey + PortalSettings.Current.PortalId.ToString();
15871592
var razorTempl = (string)GetModCache(cachekey);
15881593
if (razorTempl == null || StoreSettings.Current.DebugMode)
15891594
{
1590-
razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
1591-
if (razorTempl != "")
1595+
lock (lockobjectRenderGroupCategoryList)
15921596
{
1593-
var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
1594-
nbRazor.ModuleId = moduleid;
1595-
nbRazor.FullTemplateName = theme + "." + razorTemplName;
1596-
nbRazor.TemplateName = razorTemplName;
1597-
nbRazor.ThemeFolder = theme;
1598-
nbRazor.Lang = lang;
1599-
1600-
var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
1601-
razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
1602-
if (cacheKey != "") SetModCache(moduleid, cachekey, razorTempl); // only save to cache if we pass in a cache key.
1597+
razorTempl = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
1598+
if (razorTempl != "")
1599+
{
1600+
var nbRazor = new NBrightRazor(objList.Cast<object>().ToList(), settings, HttpContext.Current.Request.QueryString);
1601+
nbRazor.ModuleId = moduleid;
1602+
nbRazor.FullTemplateName = theme + "." + razorTemplName;
1603+
nbRazor.TemplateName = razorTemplName;
1604+
nbRazor.ThemeFolder = theme;
1605+
nbRazor.Lang = lang;
1606+
1607+
var razorTemplateKey = "NBrightBuyRazorKey" + theme + razorTemplName + PortalSettings.Current.PortalId.ToString();
1608+
razorTempl = RazorRender(nbRazor, razorTempl, razorTemplateKey, StoreSettings.Current.DebugMode);
1609+
if (cacheKey != "") SetModCache(moduleid, cachekey, razorTempl); // only save to cache if we pass in a cache key.
1610+
}
16031611
}
16041612
}
16051613
return razorTempl;
16061614
}
16071615

1616+
private static string lockobjectRazorPreProcessTempl = "lockitRazorPreProcessTempl";
16081617
public static Dictionary<string, string> RazorPreProcessTempl(string razorTemplName, string templateControlPath, string theme, string lang, Dictionary<string, string> settings, string moduleid = "")
16091618
{
16101619
// match the "AddPreProcessMetaData()" cachekey.
@@ -1618,37 +1627,40 @@ public static Dictionary<string, string> RazorPreProcessTempl(string razorTemplN
16181627
if (cachedlist != null) return cachedlist;
16191628
}
16201629

1621-
// build cache data from template.
1622-
var razorTemplate = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
1623-
if (razorTemplate != "" && razorTemplate.Contains("AddPreProcessMetaData"))
1624-
{
1625-
var obj = new NBrightInfo(true);
1626-
obj.Lang = lang;
1627-
obj.ModuleId = -1;
1628-
var l = new List<object>();
1629-
l.Add(obj);
1630-
var modRazor = new NBrightRazor(l, settings, HttpContext.Current.Request.QueryString);
1631-
modRazor.FullTemplateName = theme + "." + razorTemplName;
1632-
modRazor.TemplateName = razorTemplName;
1633-
modRazor.ThemeFolder = theme;
1634-
modRazor.Lang = lang;
1635-
try
1630+
lock (lockobjectRazorPreProcessTempl)
1631+
{
1632+
// build cache data from template.
1633+
var razorTemplate = GetRazorTemplateData(razorTemplName, templateControlPath, theme, lang);
1634+
if (razorTemplate != "" && razorTemplate.Contains("AddPreProcessMetaData"))
16361635
{
1637-
// do razor and cache preprocessmetadata
1638-
razorTemplate = RazorRender(modRazor, razorTemplate, cachekey, false);
1636+
var obj = new NBrightInfo(true);
1637+
obj.Lang = lang;
1638+
obj.ModuleId = -1;
1639+
var l = new List<object>();
1640+
l.Add(obj);
1641+
var modRazor = new NBrightRazor(l, settings, HttpContext.Current.Request.QueryString);
1642+
modRazor.FullTemplateName = theme + "." + razorTemplName;
1643+
modRazor.TemplateName = razorTemplName;
1644+
modRazor.ThemeFolder = theme;
1645+
modRazor.Lang = lang;
1646+
try
1647+
{
1648+
// do razor and cache preprocessmetadata
1649+
razorTemplate = RazorRender(modRazor, razorTemplate, cachekey, false);
1650+
}
1651+
catch (Exception ex)
1652+
{
1653+
// Only log exception, could be a error because of missing data. The preprocessing doesn't care.
1654+
}
1655+
cachedlist = (Dictionary<string, string>)Utils.GetCache(cachekey);
1656+
if (cachedlist == null) cachedlist = new Dictionary<string, string>();
1657+
Utils.SetCache(cachekey, cachedlist);
16391658
}
1640-
catch (Exception ex)
1659+
else
16411660
{
1642-
// Only log exception, could be a error because of missing data. The preprocessing doesn't care.
1661+
cachedlist = new Dictionary<string, string>();
1662+
Utils.SetCache(cachekey, cachedlist);
16431663
}
1644-
cachedlist = (Dictionary<string, string>) Utils.GetCache(cachekey);
1645-
if (cachedlist == null) cachedlist = new Dictionary<string, string>();
1646-
Utils.SetCache(cachekey, cachedlist);
1647-
}
1648-
else
1649-
{
1650-
cachedlist = new Dictionary<string, string>();
1651-
Utils.SetCache(cachekey, cachedlist);
16521664
}
16531665
return cachedlist;
16541666
}

‎DNNpackager.dnnpack‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<websitedestrelpath>\DesktopModules\NBright\NBrightBuy</websitedestrelpath>
44
<websitedestbinrelpath>\bin</websitedestbinrelpath>
55
<!-- Include only files that match the regular expression -->
6-
<regexpr>(\.cshtml|\.html|\.resx|\.dnn|\.png|\.css|\.js|\.xml|\.txt|\.md|\.aspx|\.ascx|\.ashx)$</regexpr>
6+
<regexpr>(\.cshtml|\.html|\.resx|OpenStore\.dnn|\.png|\.gif|\.jpg|\.jpeg|\.css|\.js|\.xml|\.txt|\.md|\.aspx|\.ascx|\.ashx)$</regexpr>
77
<directory include='false'>
88
<!-- All paths should be from the source root (project root) -->
99
<value>\.git</value>

0 commit comments

Comments
 (0)