Disambiguate GriddlyExtensions reference

programcsharp · programcsharp · commit 26e57f742adc · 2015-09-17T11:25:36.000-07:00
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.4")]
-[assembly: AssemblyFileVersion("1.4.4")]
+[assembly: AssemblyVersion("1.4.5")]
+[assembly: AssemblyFileVersion("1.4.5")]
diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilterForm.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilterForm.cshtml
@@ -31,7 +31,7 @@
                     @:<div class="input-group input-group-sm">
                     if (filter.DataType == FilterDataType.Currency)
                     {
-                        <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
+                        <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>
                     }
                     else if (filter.DataType == FilterDataType.Date)
                     {
@@ -58,7 +58,7 @@
                     @:<div class="input-group input-group-sm">
                     if (filter.DataType == FilterDataType.Currency)
                     {
-                        <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
+                        <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>
                     }
                     else if (filter.DataType == FilterDataType.Date)
                     {
@@ -83,7 +83,7 @@
                     @:<div class="input-group input-group-sm">
                     if (filter.DataType == FilterDataType.Currency)
                     {
-                        <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
+                        <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>
                     }
                     else if (filter.DataType == FilterDataType.Date)
                     {
diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilterInline.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilterInline.cshtml
@@ -105,7 +105,7 @@
                         <div class="input-group input-group-sm">
                             @if (filter.DataType == FilterDataType.Currency)
                             {
-                                <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
+                                <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>
                             }
                             else if (filter.DataType == FilterDataType.Date)
                             {
@@ -127,7 +127,7 @@
                         <div class="input-group input-group-sm">
                             @if (filter.DataType == FilterDataType.Currency)
                             {
-                                <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
+                                <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>
                             }
                             else if (filter.DataType == FilterDataType.Date)
                             {
@@ -147,7 +147,7 @@
                         <div class="input-group input-group-sm">
                             @if (filter.DataType == FilterDataType.Currency)
                             {
-                                <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
+                                <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>
                             }
                             else if (filter.DataType == FilterDataType.Date)
                             {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`@:<div class="input-group input-group-sm">`
`32`	`32`	`if (filter.DataType == FilterDataType.Currency)`
`33`	`33`	`{`
`34`		`- <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
	`34`	`+ <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>`
`35`	`35`	`}`
`36`	`36`	`else if (filter.DataType == FilterDataType.Date)`
`37`	`37`	`{`
`@@ -58,7 +58,7 @@`
`58`	`58`	`@:<div class="input-group input-group-sm">`
`59`	`59`	`if (filter.DataType == FilterDataType.Currency)`
`60`	`60`	`{`
`61`		`- <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
	`61`	`+ <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>`
`62`	`62`	`}`
`63`	`63`	`else if (filter.DataType == FilterDataType.Date)`
`64`	`64`	`{`
`@@ -83,7 +83,7 @@`
`83`	`83`	`@:<div class="input-group input-group-sm">`
`84`	`84`	`if (filter.DataType == FilterDataType.Currency)`
`85`	`85`	`{`
`86`		`- <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
	`86`	`+ <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>`
`87`	`87`	`}`
`88`	`88`	`else if (filter.DataType == FilterDataType.Date)`
`89`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@`
`105`	`105`	`<div class="input-group input-group-sm">`
`106`	`106`	`@if (filter.DataType == FilterDataType.Currency)`
`107`	`107`	`{`
`108`		`- <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
	`108`	`+ <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>`
`109`	`109`	`}`
`110`	`110`	`else if (filter.DataType == FilterDataType.Date)`
`111`	`111`	`{`
`@@ -127,7 +127,7 @@`
`127`	`127`	`<div class="input-group input-group-sm">`
`128`	`128`	`@if (filter.DataType == FilterDataType.Currency)`
`129`	`129`	`{`
`130`		`- <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
	`130`	`+ <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>`
`131`	`131`	`}`
`132`	`132`	`else if (filter.DataType == FilterDataType.Date)`
`133`	`133`	`{`
`@@ -147,7 +147,7 @@`
`147`	`147`	`<div class="input-group input-group-sm">`
`148`	`148`	`@if (filter.DataType == FilterDataType.Currency)`
`149`	`149`	`{`
`150`		`- <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
	`150`	`+ <span class="input-group-addon">@Griddly.Mvc.GriddlyExtensions.CurrencySymbol</span>`
`151`	`151`	`}`
`152`	`152`	`else if (filter.DataType == FilterDataType.Date)`
`153`	`153`	`{`