OpenSource » SampleCode » Brail2Razor
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

Fixed handling of OutputSubView with single param

Changeset a3abb5320257…

Parent 6c4fad22a080…

by Profile picture of Daniel PupekDaniel Pupek

Changes to 3 files · Browse files at a3abb5320257 Showing diff from parent 6c4fad22a080 Diff from another changeset...

Change 1 of 2 Show Entire File Brail2Razor/​Brail2RazorProgram.cs Stacked
 
36
37
38
39
40
 
 
 
 
 
 
 
 
 
41
42
43
 
325
326
327
 
 
328
329
330
 
36
37
38
 
 
39
40
41
42
43
44
45
46
47
48
49
50
 
332
333
334
335
336
337
338
339
@@ -36,8 +36,15 @@
  );     public static Regex OutputSubViewRegex = new Regex( - "OutputSubView\\s*\\(\\s*(\\\"[^\"]*\\\"\\s*)\\,\\s*(\\{[^}]*" + - "\\})\\s*\\)", + @"OutputSubView\s*\(\s*(\""[^""]*\""\s*)\,\s*(\{[^}]*" + + @"\})\s*\)", + RegexOptions.Singleline + | RegexOptions.CultureInvariant + | RegexOptions.Compiled + ); + + public static Regex OutputSubviewSingleParamRegex = new Regex( + "OutputSubView\\s*\\(\\s*(\\\"[^\"]*\\\"\\s*)\\s*\\)",   RegexOptions.Singleline   | RegexOptions.CultureInvariant   | RegexOptions.Compiled @@ -325,6 +332,8 @@
    lineResult = OutputSubViewRegex.Replace(lineResult, "Html.RenderPartial($1,new ViewDataDictionary( new $2 ))");   + lineResult = OutputSubviewSingleParamRegex.Replace(lineResult, "Html.RenderPartial($1)"); +   lineResult = lineResult.Replace("realSlimShady", "SiteRoot");     if (IfBlockRegex.IsMatch(lineResult) || ForBlockRegEx.IsMatch(lineResult))
Change 1 of 2 Show Entire File Brail2Razor/​DisplayITrainingAcademicOverride.brail Stacked
 
2
3
4
 
 
5
 
6
7
8
 
40
41
42
 
43
44
45
 
2
3
4
5
6
7
8
9
10
11
 
43
44
45
46
47
48
49
@@ -2,7 +2,10 @@
 import Nexport.Models  import Nexport.Models.Assignments   +OutputSubView("WithSpace/DisplayITrainingDates") +  %> +<% OutputSubView("WithSpace/DisplayITrainingDates") %>  <div class="layout-percent">   <div class="col width-1of2 right"><label>Is Academically Overridden?:</label></div>   <div class="col last width-1of2 left"><label><% if item.AcademicOverride: %>!{commonText.yes}<% else: %>!{commonText.no}<% end %></label></div> @@ -40,6 +43,7 @@
 <% OutputSubView("templates/DisplayITrainingDates", {"item": assignmentStatus}) %>   <% OutputSubView("templates/DisplayITrainingStatus", {"item": assignmentStatus}) %>   <% OutputSubView("templates/DisplayITrainingAcademicOverride", {"item": assignmentStatus}) %> + <% OutputSubView ("WithSpace/DisplayITrainingDates", {"item": assignmentStatus}) %>       <button type="button" onclick="aoTool.overrideAssignmentStatus(this);"><span class="icon save">Override</span></button>
Change 1 of 2 Show Entire File Brail2Razor/​DisplayITrainingAcademicOverride.cshtml Stacked
 
1
2
3
 
 
4
5
6
 
38
39
40
 
41
42
43
 
1
2
 
3
4
5
6
7
 
39
40
41
42
43
44
45
@@ -1,6 +1,7 @@
 @using Nexport.Models;  @using Nexport.Models.Assignments; - +@Html.RenderPartial("WithSpace/DisplayITrainingDates") +@Html.RenderPartial("WithSpace/DisplayITrainingDates")  <div class="layout-percent">   <div class="col width-1of2 right"><label>Is Academically Overridden?:</label></div>   <div class="col last width-1of2 left"><label>@if(item.AcademicOverride){@commonText.yes}else{@commonText.no}</label></div> @@ -38,6 +39,7 @@
 @Html.RenderPartial("templates/DisplayITrainingDates",new ViewDataDictionary( new {item = assignmentStatus} ))   @Html.RenderPartial("templates/DisplayITrainingStatus",new ViewDataDictionary( new {item = assignmentStatus} ))   @Html.RenderPartial("templates/DisplayITrainingAcademicOverride",new ViewDataDictionary( new {item = assignmentStatus} )) + @Html.RenderPartial("WithSpace/DisplayITrainingDates",new ViewDataDictionary( new {item = assignmentStatus} ))       <button type="button" onclick="aoTool.overrideAssignmentStatus(this);"><span class="icon save">Override</span></button>