X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FElements%2FTabs;h=bcc97e52a443d0befcd4b2dd541bbf9abcb8c41f;hb=34e42c0d926bf569ceaf8da784c2569bc7f83cec;hp=3a8a176c4a3ee2e5ddf0b5d70b212fd254bbfe63;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git

diff --git a/rt/share/html/Ticket/Elements/Tabs b/rt/share/html/Ticket/Elements/Tabs
index 3a8a176c4..bcc97e52a 100755
--- a/rt/share/html/Ticket/Elements/Tabs
+++ b/rt/share/html/Ticket/Elements/Tabs
@@ -196,7 +196,9 @@ if ($Ticket) {
     if ( $can{'ModifyTicket'} ) {
         if ( $Ticket->Status ne 'resolved' ) {
             $actions->{'G'} = {
-                path =>
+                path => 
+                    ($Ticket->MissingRequiredFields) ? 
+                    "Ticket/Modify.html?Status=resolved&id=$id" :
                     "Ticket/Update.html?Action="
                     . RT->Config->Get('ResolveDefaultUpdateType', $session{'CurrentUser'})
                     . "&DefaultStatus=resolved&id="
@@ -324,10 +326,15 @@ if ($has_query) {
         title => loc('Show Results'),
     };
 
-    $tabs->{"j"} = {
-        path  => "Search/Bulk.html$args",
-        title => loc('Bulk Update'),
-    };
+    #freeside
+    if ( $session{'CurrentUser'}
+         ->HasRight(Right => 'BulkUpdateTickets', Object => $RT::System) )
+    {
+      $tabs->{"j"} = {
+          path  => "Search/Bulk.html$args",
+          title => loc('Bulk Update'),
+      };
+    }
 
     $tabs->{"k"} = {
         path  => "Search/Chart.html$args",