[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.2-129-gcce632b

[Kevin Falcone]

The branch, 4.2-trunk has been updated
       via  cce632b20ca0e16a67945bab3a1e81f1ffdb9216 (commit)
       via  235702851c3e20114629329ddab552669f5503ea (commit)
       via  fb67b690896c63c5c737ae467e8969f2dc5f332f (commit)
       via  f6e4a2f6205f442e965b8b7c1270f890112eb2b6 (commit)
       via  364df767a13143ee113fa30d1460bacb1a32193a (commit)
      from  1f4a0bc774e4cc6c9a0d2228f193eaadead2403d (commit)

Summary of changes:
 lib/RT/Record/Role/Roles.pm  | 8 +++++++-
 share/html/Elements/ShowLink | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 364df767a13143ee113fa30d1460bacb1a32193a
Author: Christian Loos <cloos at netcologne.de>
Date:   Thu Jan 23 15:23:53 2014 +0100

    introduce a new ticket-active class and add status
    
    This makes it possible to style active ticket links different and
    also style ticket links by status.

diff --git a/share/html/Elements/ShowLink b/share/html/Elements/ShowLink
index 51dd70c..18a8909 100644
--- a/share/html/Elements/ShowLink
+++ b/share/html/Elements/ShowLink
@@ -47,9 +47,12 @@
 %# END BPS TAGGED BLOCK }}}
 % my $member = $URI->Object;
 % if (blessed($member) && $member->isa("RT::Ticket")) {
-% my $inactive = $member->QueueObj->IsInactiveStatus($member->Status);
+% my $class = $member->QueueObj->IsInactiveStatus($member->Status)
+%     ? 'ticket-inactive'
+%     : 'ticket-active';
+% $class .= ' '.CSSClass($member->Status);
 
-<span class="<% $inactive ? 'ticket-inactive' : '' %>">
+<span class="<% $class %>">
 <a href="<% $href %>"><%$member->Id%>: <%$member->Subject || ''%> [<% loc($member->Status) %>]</a> (<& /Elements/ShowUser, User => $member->OwnerObj &>)
 </span>
 

commit 235702851c3e20114629329ddab552669f5503ea
Merge: 1f4a0bc 364df76
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 14 13:59:00 2014 -0500

    Merge branch '4.2/ticket-status-in-link-class' into 4.2-trunk
    
    Conflicts:
    	share/html/Elements/ShowLink

diff --cc share/html/Elements/ShowLink
index 8f18a4c,18a8909..fec4b20
--- a/share/html/Elements/ShowLink
+++ b/share/html/Elements/ShowLink
@@@ -46,10 -46,13 +46,13 @@@
  %#
  %# END BPS TAGGED BLOCK }}}
  % my $member = $URI->Object;
 -% if (blessed($member) && $member->isa("RT::Ticket")) {
 +% if (blessed($member) and $member->isa("RT::Ticket") and $member->CurrentUserHasRight('ShowTicket')) {
- % my $inactive = $member->QueueObj->IsInactiveStatus($member->Status);
+ % my $class = $member->QueueObj->IsInactiveStatus($member->Status)
+ %     ? 'ticket-inactive'
+ %     : 'ticket-active';
+ % $class .= ' '.CSSClass($member->Status);
  
- <span class="<% $inactive ? 'ticket-inactive' : '' %>">
+ <span class="<% $class %>">
  <a href="<% $href %>"><%$member->Id%>: <%$member->Subject || ''%> [<% loc($member->Status) %>]</a> (<& /Elements/ShowUser, User => $member->OwnerObj &>)
  </span>
  

commit cce632b20ca0e16a67945bab3a1e81f1ffdb9216
Merge: 2357028 fb67b69
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 14 13:59:33 2014 -0500

    Merge branch '4.2/remove-role-acl' into 4.2-trunk


-----------------------------------------------------------------------