[Rt-commit] rt branch, 4.6/core-customrole-visibility, repushed

[Blaine Motsinger]

The branch 4.6/core-customrole-visibility was deleted and repushed:
       was c6776c71cd87c860d49a0c024346bb996a88689e
       now 2f1c758effc389d966667f4a6bac839d3ab5ad84

1: 5717dc6fa ! 1: a05a8d031 Core RT-Extension-CustomRole-Visibility
    @@ -61,9 +61,71 @@
     --- a/lib/RT/Queue.pm
     +++ b/lib/RT/Queue.pm
     @@
    -     );
    +     return ($status, $self->loc("Queue's default service level has been changed"));
      }
      
    ++sub InitialPriority {
    ++    my $self = shift;
    ++    RT->Deprecated( Instead => "DefaultValue('InitialPriority')", Remove => '4.6' );
    ++    return $self->DefaultValue('InitialPriority');
    ++}
    ++
    ++sub FinalPriority {
    ++    my $self = shift;
    ++    RT->Deprecated( Instead => "DefaultValue('FinalPriority')", Remove => '4.6' );
    ++    return $self->DefaultValue('FinalPriority');
    ++}
    ++
    ++sub DefaultDueIn {
    ++    my $self = shift;
    ++    RT->Deprecated( Instead => "DefaultValue('Due')", Remove => '4.6' );
    ++
    ++    # DefaultDueIn used to be a number of days; so if the DefaultValue is,
    ++    # say, "3 days" then return 3
    ++    my $due = $self->DefaultValue('Due');
    ++    if (defined($due) && $due =~ /^(\d+) days?$/i) {
    ++        return $1;
    ++    }
    ++
    ++    return $due;
    ++}
    ++
    ++sub SetInitialPriority {
    ++    my $self = shift;
    ++    my $value = shift;
    ++    RT->Deprecated( Instead => "SetDefaultValue", Remove => '4.6' );
    ++    return $self->SetDefaultValue(
    ++        Name => 'InitialPriority',
    ++        Value => $value,
    ++    );
    ++}
    ++
    ++sub SetFinalPriority {
    ++    my $self = shift;
    ++    my $value = shift;
    ++    RT->Deprecated( Instead => "SetDefaultValue", Remove => '4.6' );
    ++    return $self->SetDefaultValue(
    ++        Name => 'FinalPriority',
    ++        Value => $value,
    ++    );
    ++}
    ++
    ++sub SetDefaultDueIn {
    ++    my $self = shift;
    ++    my $value = shift;
    ++
    ++    # DefaultDueIn used to be a number of days; so if we're setting to,
    ++    # say, "3" then add the word "days" to match the way the new
    ++    # DefaultValues works
    ++    $value .= " days" if defined($value) && $value =~ /^\d+$/;
    ++
    ++    RT->Deprecated( Instead => "SetDefaultValue", Remove => '4.6' );
    ++    return $self->SetDefaultValue(
    ++        Name => 'Due',
    ++        Value => $value,
    ++    );
    ++}
    ++
     +sub HiddenCustomRoleIDsForURL {
     +    my $self = shift;
     +    my $url  = shift;
2: c62e2b860 ! 2: bacdc9b25 Migrate Visibility.html to elevator themes
    @@ -1,9 +1,6 @@
     Author: Blaine Motsinger <blaine at bestpractical.com>
     
         Migrate Visibility.html to elevator themes
    -    
    -    This commit also contains additional styling in misc.css to correct
    -    alignment for the new page.
     
     diff --git a/share/html/Admin/CustomRoles/Visibility.html b/share/html/Admin/CustomRoles/Visibility.html
     --- a/share/html/Admin/CustomRoles/Visibility.html
    @@ -22,19 +19,23 @@
     -        <td><label><input type="radio" class="radio" name="hide-<% $url %>" value="0" <% !$hidden{$url} ? qq[checked="checked"] : qq[] |n %>> <&|/l&>show</&></label></td>
     -        <td><label><input type="radio" class="radio" name="hide-<% $url %>" value="1" <%  $hidden{$url} ? qq[checked="checked"] : qq[] |n %>> <&|/l&>hide</&></label></td>
     -    </tr>
    -+  <div class="form-row">
    ++  <div class="form-row boolean">
     +    <div class="col-md-3 label">
     +      <% $label %>:
     +    </div>
     +    <div class="col-md-9 value">
     +      <div class="form-row">
    -+        <div class="custom-control custom-radio">
    -+          <input type="radio" class="custom-control-input" id="show-<% $url %>" name="hide-<% $url %>" value="0" <% !$hidden{$url} ? qq[checked="checked"] : qq[] |n %>>
    -+          <label class="custom-control-label" for="show-<% $url %>"><&|/l&>show</&></label>
    ++        <div class="col-md-auto">
    ++          <div class="custom-control custom-radio">
    ++            <input type="radio" class="custom-control-input" id="show-<% $url %>" name="hide-<% $url %>" value="0" <% !$hidden{$url} ? qq[checked="checked"] : qq[] |n %>>
    ++            <label class="custom-control-label" for="show-<% $url %>"><&|/l&>show</&></label>
    ++          </div>
     +        </div>
    -+        <div class="custom-control custom-radio">
    -+          <input type="radio" class="custom-control-input" id="hide-<% $url %>" name="hide-<% $url %>" value="1" <%  $hidden{$url} ? qq[checked="checked"] : qq[] |n %>>
    -+          <label class="custom-control-label" for="hide-<% $url %>"><&|/l&>hide</&></label>
    ++        <div class="col-md-auto">
    ++          <div class="custom-control custom-radio">
    ++            <input type="radio" class="custom-control-input" id="hide-<% $url %>" name="hide-<% $url %>" value="1" <%  $hidden{$url} ? qq[checked="checked"] : qq[] |n %>>
    ++            <label class="custom-control-label" for="hide-<% $url %>"><&|/l&>hide</&></label>
    ++          </div>
     +        </div>
     +      </div>
     +    </div>
    @@ -46,18 +47,3 @@
      <& /Elements/Submit, Name => 'Update' &>
      
     
    -diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
    ---- a/share/static/css/elevator-light/misc.css
    -+++ b/share/static/css/elevator-light/misc.css
    -@@
    - .oddline {
    -     background-color: rgba(0, 0, 0, 0.05);
    - }
    -+
    -+/* styling correction for customrole visiblity */
    -+#comp-Admin-CustomRoles-Visibility .custom-control.custom-radio {
    -+    padding-left: 2em;
    -+    padding-right: 0.2em;
    -+    padding-top: 0.4em;
    -+}
    -
3: b24a8cea7 = 3: 2b85d5ee6 Add test for customrole visibility
4: c6776c71c ! 4: 255821d42 Update role entry hints to tooltips
    @@ -35,3 +35,4 @@
      </div>
      
      % }
    +
-:  ------- > 5: d129efddf Add CustomRole::Visibility to %CORED_PLUGINS
-:  ------- > 6: 2f1c758ef Add titlebox to CustomRoles Visibility page