Changeset 6c4fad22a080…
Parent 4e4c1d05bc11…
by Daniel Pupek
Changes to 3 files · Browse files at 6c4fad22a080 Showing diff from parent 4e4c1d05bc11 Diff from another changeset...
@@ -385,7 +385,7 @@
finalResult = AddSemiColonsRegex.Replace(finalResult, "$1;\n");
- finalResult = string.Format("@{{{0}}}", finalResult);
+ finalResult = string.Format("@({0})", finalResult);
}
else
{
|
@@ -14,17 +14,26 @@
<% if item.AcademicOverrideAdmin == null and not rt == rt :%>
+<% end %>
<% if rondell is null:%>
+<% end %>
+
<% if rondell is null :%>
+<% end %>
+
<% if item.AcademicOverrideAdmin == null and not rt == rt and not re != re.Tom() :%>
+<% end %>
<% if item.AcademicOverrideAdmin == null and not rt == rt and not re != re.Eddie :%>
+<% end %>
+
<% if not item.AcademicOverrideAdmin == null and rt == rt and not re != re.Eddie :%>
+<% end %>
<% if item.AcademicOverrideAdmin == null and rt == rt :%>
@@ -49,4 +58,6 @@ </button>
<% end %>
<button type="button" onclick="aoTool.deleteAssignmentStatus(this); return false;"><span class="icon bomb">Destroy</span></button>
- </div>
\ No newline at end of file+ </div>
+
+ <% end %>
\ No newline at end of file |
@@ -12,17 +12,26 @@
@if(item.AcademicOverrideAdmin == null && !(rt == rt) ){
+}
@if(rondell == null){
+}
+
@if(rondell == null ){
+}
+
@if(item.AcademicOverrideAdmin == null && !(rt == rt && !(re != re.Tom())) ){
+}
@if(item.AcademicOverrideAdmin == null && !(rt == rt && !(re != re.Eddie)) ){
+}
+
@if(!(item.AcademicOverrideAdmin == null )&& rt == rt && !(re != re.Eddie) ){
+}
@if(item.AcademicOverrideAdmin == null && rt == rt ){
@@ -32,12 +41,12 @@
<button type="button" onclick="aoTool.overrideAssignmentStatus(this);"><span class="icon save">Override</span></button>
- @{disabled = " disabled=\"disabled\"";
+ @(disabled = " disabled=\"disabled\"";
if( assignmentStatus != null && assignmentStatus.AcademicOverride){
disabled = "";
-}}
+})
<button type="button" onclick="aoTool.removeAssignmentStatusOverride(this);"@disabled><span class="icon undo">Undo Override</span></button>
@@ -48,4 +57,6 @@ </button>
}
<button type="button" onclick="aoTool.deleteAssignmentStatus(this); return false;"><span class="icon bomb">Destroy</span></button>
- </div>
\ No newline at end of file+ </div>
+
+ }
\ No newline at end of file |
Loading...