Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Show close election button after conflicts are cleared.

  • Loading branch information...
commit 6fde077880f0f6e357f37bed10031f3def4b0a2e 1 parent 799fb85
@mattbasta authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 current/committee_election.aspx.cs
View
9 current/committee_election.aspx.cs
@@ -880,13 +880,16 @@ protected void Disq_Click(Object sender, EventArgs e)
// remove the election conflict
int id = int.Parse(idToFind);
- ElectionConflict conflict = ElectionConflict.FindElectionConflict(session,
- id);
+ ElectionConflict conflict = ElectionConflict.FindElectionConflict(session, id);
NHibernateHelper.Delete(session, conflict);
// Check if we should display there are no more conflicts.
- if (ElectionConflict.FindElectionConflicts(session, election.ID).Count == 0)
+ if (ElectionConflict.FindElectionConflicts(session, election.ID).Count == 0) {
AdminNoConflicts.Visible = true;
+ DaysRemaining.Text = "The election may proceed now that no conflicts exist.";
+ JulioButton.Visible = true;
+ JulioButtonSpacerText.Visible = true;
+ }
NHibernateHelper.Finished(transaction);
}
Please sign in to comment.
Something went wrong with that request. Please try again.