[Rt-commit] r8569 - in rt/branches/3.7-EXPERIMENTAL-TUNIS/html: Ticket Ticket/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Wed Aug 15 22:02:19 2007
New Revision: 8569

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowLock
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/Tabs
   rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html

Log:
* comment out things left from locking to make it possible to hack on
  other things

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowLock
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowLock	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Elements/ShowLock	Wed Aug 15 22:02:19 2007
@@ -52,6 +52,7 @@
 </div>
 %}
 <%INIT>
+return;
 if ( $Id ) {
     $Ticket = LoadTicket($Id);
 }

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Display.html	Wed Aug 15 22:02:19 2007
@@ -133,22 +133,22 @@
         }
     }
     
-    if ( defined $ARGS{'Lock'} ) {
-        if ( $ARGS{'Lock'} eq 'add' ) {
-            if ( $TicketObj->Lock('Hard') ) {
-                push @Actions, loc('You now have a lock on this ticket');
-            } else {
-                push @Actions, loc('Your attempt to lock this ticket failed');
-            }
-        } elsif ( $ARGS{'Lock'} eq 'remove' ) {
-            my $msg;
-            ($Duration, $msg) = $TicketObj->Unlock('Hard');
-            push @Actions, loc($msg);
-        } elsif ( $ARGS{'Lock'} eq 'break' ) {
-            $TicketObj->BreakLock();
-            push @Actions, loc('You have broken the lock on this ticket');
-        }
-    }
+#    if ( defined $ARGS{'Lock'} ) {
+#        if ( $ARGS{'Lock'} eq 'add' ) {
+#            if ( $TicketObj->Lock('Hard') ) {
+#                push @Actions, loc('You now have a lock on this ticket');
+#            } else {
+#                push @Actions, loc('Your attempt to lock this ticket failed');
+#            }
+#        } elsif ( $ARGS{'Lock'} eq 'remove' ) {
+#            my $msg;
+#            ($Duration, $msg) = $TicketObj->Unlock('Hard');
+#            push @Actions, loc($msg);
+#        } elsif ( $ARGS{'Lock'} eq 'break' ) {
+#            $TicketObj->BreakLock();
+#            push @Actions, loc('You have broken the lock on this ticket');
+#        }
+#    }
 
     $ARGS{'UpdateContent'} =~ s/\r\n/\n/g if defined $ARGS{'UpdateContent'};
     if ( $ARGS{'UpdateTimeWorked'} || (

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/Tabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Elements/Tabs	Wed Aug 15 22:02:19 2007
@@ -235,29 +235,29 @@
     ($searchtab =~ /^_/) ? $tabs->{"s".$searchtab} = $searchtabs->{$searchtab} : $tabs->{"z_".$searchtab} = $searchtabs->{$searchtab};
   }
 }
-if ($Ticket) {
-	if (my $Lock = $Ticket->Locked()) {
-		if ($Lock->Content->{'User'} == $session{'CurrentUser'}->id) {
-		$actions->{'Lock'} = { 
-						path  => "Ticket/Display.html?Lock=remove&id=" . $Ticket->Id,
-						title => loc('Unlock') 
-						};
-		} else {
-		$actions->{'Lock'} = { 
-						path  => "Ticket/Display.html?Lock=break&id=" . $Ticket->Id,
-						title => loc('Break lock') 
-						};
-
-		}
-	} else {
-		$actions->{'Lock'} = { 
-						path  => "Ticket/Display.html?Lock=add&id=" . $Ticket->Id,
-						title => loc('Lock') 
-						};
-
-
-	}
-}
+#if ($Ticket) {
+#	if (my $Lock = $Ticket->Locked()) {
+#		if ($Lock->Content->{'User'} == $session{'CurrentUser'}->id) {
+#		$actions->{'Lock'} = { 
+#						path  => "Ticket/Display.html?Lock=remove&id=" . $Ticket->Id,
+#						title => loc('Unlock') 
+#						};
+#		} else {
+#		$actions->{'Lock'} = { 
+#						path  => "Ticket/Display.html?Lock=break&id=" . $Ticket->Id,
+#						title => loc('Break lock') 
+#						};
+#
+#		}
+#	} else {
+#		$actions->{'Lock'} = { 
+#						path  => "Ticket/Display.html?Lock=add&id=" . $Ticket->Id,
+#						title => loc('Lock') 
+#						};
+#
+#
+#	}
+#}
 
 </%INIT>
 

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/html/Ticket/Update.html	Wed Aug 15 22:02:19 2007
@@ -150,7 +150,7 @@
 
 my $TicketObj = LoadTicket($id);
 
-$TicketObj->Lock();
+#$TicketObj->Lock();
 
 unless($DefaultStatus){
     $DefaultStatus=($ARGS{'Status'} ||$TicketObj->Status());
@@ -234,10 +234,10 @@
 # }}}
 
 if ( exists $ARGS{SubmitTicket} ) {
-	my $lock = $TicketObj->Locked();
-	my $Duration = time() - $lock->Content->{'Timestamp'} if $lock;
-	$TicketObj->Unlock();
-    $m->comp('Display.html', TicketObj => $TicketObj, Duration => $Duration, %ARGS);
+#	my $lock = $TicketObj->Locked();
+#	my $Duration = time() - $lock->Content->{'Timestamp'} if $lock;
+#	$TicketObj->Unlock();
+    $m->comp('Display.html', TicketObj => $TicketObj, %ARGS);
     return;
 }