File tree Expand file tree Collapse file tree 3 files changed +15
-8
lines changed
Griddly/Views/Shared/Griddly Expand file tree Collapse file tree 3 files changed +15
-8
lines changed Original file line number Diff line number Diff line change 15
15
//
16
16
// You can specify all the values or you can default the Revision and Build Numbers
17
17
// by using the '*' as shown below:
18
- [ assembly: AssemblyVersion ( "1.9.0 " ) ]
19
- [ assembly: AssemblyFileVersion ( "1.9.0 " ) ]
18
+ [ assembly: AssemblyVersion ( "1.9.1 " ) ]
19
+ [ assembly: AssemblyFileVersion ( "1.9.1 " ) ]
20
20
//[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]
Original file line number Diff line number Diff line change @@ -80,6 +80,8 @@ public GriddlySettings()
80
80
public List < GriddlyButton > Buttons { get ; set ; }
81
81
public List < GriddlyExport > Exports { get ; set ; }
82
82
83
+ public Action < GriddlySettings , GriddlyResultPage , HtmlHelper > BeforeRenderThis = null ;
84
+
83
85
public Func < object , object > BeforeTemplate { get ; set ; }
84
86
public Func < object , object > AfterTemplate { get ; set ; }
85
87
public Func < GriddlySettings , object > FilterTemplate { get ; set ; }
Original file line number Diff line number Diff line change 25
25
{
26
26
GriddlySettings .BeforeRender (settings , Model , Html );
27
27
}
28
-
28
+
29
+ if (settings .BeforeRenderThis != null )
30
+ {
31
+ settings .BeforeRenderThis (settings , Model , Html );
32
+ }
33
+
29
34
if (settings .AllowedFilterModes == null )
30
35
{
31
36
FilterMode allowedModes = FilterMode .None ;
42
47
43
48
settings .AllowedFilterModes = allowedModes ;
44
49
}
45
-
50
+
46
51
if (settings .AllowedFilterModes != FilterMode .None )
47
52
{
48
53
if (settings .InitialFilterMode == null )
49
54
{
50
- if (settings .AllowedFilterModes .Value .HasFlag (FilterMode .Inline ))
55
+ if (settings .AllowedFilterModes .Value .HasFlag (FilterMode .Inline ))
51
56
{
52
57
settings .InitialFilterMode = FilterMode .Inline ;
53
58
}
54
59
else if (settings .AllowedFilterModes .Value .HasFlag (FilterMode .Form ))
55
60
{
56
61
settings .InitialFilterMode = FilterMode .Form ;
57
62
}
58
-
63
+
59
64
if (settings .InitialFilterMode == null || settings .InitialFilterMode == FilterMode .Both )
60
65
{
61
66
throw new InvalidOperationException (" Invalid InitialFilterMode: " + settings .InitialFilterMode + " ." );
62
- }
67
+ }
63
68
}
64
-
69
+
65
70
if (settings .AllowedFilterModes .Value .HasFlag (FilterMode .Inline ) && settings .InlineFilterTemplate == null && settings .Columns .Any (x => x .Filter != null ))
66
71
{
67
72
settings .InlineFilterTemplate = (x ) => RenderInlineFilters (x );
You can’t perform that action at this time.
0 commit comments