[Rt-commit] rt branch, 4.0/apply-scrips-to-multiple-queues, updated. rt-4.0.4-182-g00c46f0

[Thomas Sibley]

The branch, 4.0/apply-scrips-to-multiple-queues has been updated
       via  00c46f0681f1a28a55b3b823c4fad4449e739af0 (commit)
       via  42dc5c734ed819169eb0a5aeb83426091637eb58 (commit)
      from  d7093d8e64cff5ad3638f6e922854f8fc0160504 (commit)

Summary of changes:
 share/html/Admin/Elements/EditScrips  |    4 +++-
 share/html/Admin/Elements/SelectStage |    7 ++++---
 share/html/NoAuth/css/base/admin.css  |    7 +++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 42dc5c734ed819169eb0a5aeb83426091637eb58
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jan 11 16:58:18 2012 -0500

    Better heading for TransactionCreate scrips and short explanatory text
    
    Finally we'll have some description of the difference in the interface!

diff --git a/share/html/Admin/Elements/EditScrips b/share/html/Admin/Elements/EditScrips
index d9ed8b6..d4a4578 100755
--- a/share/html/Admin/Elements/EditScrips
+++ b/share/html/Admin/Elements/EditScrips
@@ -50,7 +50,8 @@
 <form action="Scrips.html" method="post">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
-<h2><&|/l&>On create scrips</&></h2>
+<h2><&|/l&>Scrips</&></h2>
+<div class="admin-hint">Scrips run after each individual change to a ticket.</div>
 % my $scrips = $find_scrips->(Stage => 'TransactionCreate');
 <& /Elements/CollectionList, %common_applied_args, Collection => $scrips &>
 % unless ( $scrips->Count ) {
@@ -58,6 +59,7 @@
 % }
 
 <h2><&|/l&>Batch scrips</&></h2>
+<div class="admin-hint">Batch scrips run after a set of related changes to a ticket.</div>
 % $scrips = $find_scrips->(Stage => 'TransactionBatch');
 <& /Elements/CollectionList, %common_applied_args, Collection => $scrips &>
 % unless ( $scrips->Count ) {
diff --git a/share/html/NoAuth/css/base/admin.css b/share/html/NoAuth/css/base/admin.css
index 287aac8..a1fbf4f 100644
--- a/share/html/NoAuth/css/base/admin.css
+++ b/share/html/NoAuth/css/base/admin.css
@@ -95,3 +95,10 @@ ul.list-menu ul li {
     padding-bottom: 0;
 }
 
+.admin-hint {
+    font-style: italic;
+}
+
+h2 + .admin-hint {
+    margin-top: -1em;
+}

commit 00c46f0681f1a28a55b3b823c4fad4449e739af0
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jan 11 17:15:10 2012 -0500

    Display Normal and Batch instead of TransactionCreate and TransactionBatch
    
    Additionally, disable the displayed Batch option if UseTransactionBatch
    is turned off by RT's configuration.

diff --git a/share/html/Admin/Elements/EditScrips b/share/html/Admin/Elements/EditScrips
index d4a4578..8cd2334 100755
--- a/share/html/Admin/Elements/EditScrips
+++ b/share/html/Admin/Elements/EditScrips
@@ -51,7 +51,7 @@
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
 <h2><&|/l&>Scrips</&></h2>
-<div class="admin-hint">Scrips run after each individual change to a ticket.</div>
+<div class="admin-hint">Scrips normally run after each individual change to a ticket.</div>
 % my $scrips = $find_scrips->(Stage => 'TransactionCreate');
 <& /Elements/CollectionList, %common_applied_args, Collection => $scrips &>
 % unless ( $scrips->Count ) {
diff --git a/share/html/Admin/Elements/SelectStage b/share/html/Admin/Elements/SelectStage
index e20ee3d..fafb879 100644
--- a/share/html/Admin/Elements/SelectStage
+++ b/share/html/Admin/Elements/SelectStage
@@ -53,6 +53,7 @@
 
 <option value="<%$value%>"
 <% ($value eq $Default) && qq[ selected="selected"] |n %>
+<% ($value eq 'TransactionBatch' and not RT->Config->Get('UseTransactionBatch')) && qq[ disabled ] %>
 ><% loc($display) %>
 </option>
 
@@ -62,11 +63,11 @@
 if ( !defined $Default || $Default eq '') {
     $Default = 'TransactionCreate';
 }
-my @stages = 'TransactionCreate';
+my @stages = ['TransactionCreate', loc('Normal')];
 
 push @stages, RT->Config->Get('UseTransactionBatch')
-            ? 'TransactionBatch'
-            : ['TransactionBatch', 'TransactionBatch (DISABLED)'];
+            ? ['TransactionBatch', loc('Batch')]
+            : ['TransactionBatch', loc('Batch (disabled by config)')];
 </%INIT>
 <%ARGS>
 $Default => 'TransactionCreate'

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