[Rt-commit] [rtir] 01/01: Merge branch '3.0-trunk'

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch master
in repository rtir.

commit 7be27b666777f3ceb274096657c7179aacd3c2a2
Merge: 93b618b d23c281
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Sep 22 17:09:54 2014 -0400

    Merge branch '3.0-trunk'

 docs/Constituencies.pod             | 13 +++++++++----
 html/RTIR/Create.html               |  7 ++-----
 html/RTIR/Elements/EditConstituency | 10 +++++++++-
 html/RTIR/Incident/Create.html      |  7 ++-----
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --cc html/RTIR/Elements/EditConstituency
index 2d4f747,40ab802..8dcf6a8
--- a/html/RTIR/Elements/EditConstituency
+++ b/html/RTIR/Elements/EditConstituency
@@@ -51,9 -51,9 +51,9 @@@
  %       my $selected = 0;
  %       my @category;
  %       my $id = $NamePrefix . $CustomField->Id;
- %       my $out = $m->scomp('SELF:options', %ARGS, SelectedRef => \$selected, CategoryRef => \@category, Object => $Object);
+ %       my $out = $m->scomp('SELF:options', %ARGS, SelectedRef => \$selected, CategoryRef => \@category, Object => $Object, Default => $Default);
  %       if (@category) {
 -<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/NoAuth/js/cascaded.js"></script>
 +<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/static/js/cascaded.js"></script>
  %#      XXX - Hide this select from w3m?
        <select onchange="filter_cascade('<% $id %>-Values', this.value)" name="<% $id %>-Category">
          <option value="" <% !$selected && 'selected' %>><&|/l&>-</&></option>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.