[Rt-commit] rt branch, master, updated. rt-4.1.8-325-ge03a393

Alex Vandiver alexmv at bestpractical.com
Fri May 17 19:48:39 EDT 2013


The branch, master has been updated
       via  e03a393853aada63236421bd122fd605e39d3e85 (commit)
       via  36acf7932f959779a4b12b057b6c5eeab7db15b2 (commit)
       via  46fc44784bd65e8b1a6af2adfbe13e7b071336da (commit)
       via  f437ebb74933d90214b134268f1d9ec609430b88 (commit)
       via  3767eddc534edaa6cf1b490e6183a5a148e1af3b (commit)
       via  ba0ed2a3ee62d4c3584fc9e58c170e4a6b5712fd (commit)
       via  2b083a0f8ebd523a740c6f97b0f9576f7ac2caa9 (commit)
       via  03e85345d61a149e23bf1704da83fd5f572ef7da (commit)
       via  4359543316c35b66c028b66e91091dd4ddd4283d (commit)
       via  3dd463a7dd366d30408bc8160240e47b0211d0ed (commit)
       via  c0717a6928af78a798933eccfdbf2f43ad0b6601 (commit)
       via  ac86c0df0bd89ff4e8656b83733c24a4ca899c41 (commit)
      from  aea36f9d124abc594e0da8312a19db9b8e3fe009 (commit)

Summary of changes:
 docs/UPGRADING-4.2                                  |  7 +++++++
 docs/authentication.pod                             |  2 +-
 docs/customizing/approvals.pod                      |  6 +++---
 docs/customizing/articles_introduction.pod          | 21 +++++++++++++--------
 docs/customizing/styling_rt.pod                     |  2 +-
 etc/RT_Config.pm.in                                 |  4 ++--
 etc/upgrade/4.1.12/content                          | 10 ++++++++++
 lib/RT/Action/LinearEscalate.pm                     |  2 +-
 lib/RT/Crypt/GnuPG.pm                               |  2 +-
 lib/RT/Generated.pm.in                              |  1 +
 lib/RT/Shredder.pm                                  |  2 +-
 lib/RT/System.pm                                    |  4 +++-
 share/html/Admin/Articles/index.html                |  2 +-
 share/html/Admin/Global/index.html                  |  2 +-
 share/html/Admin/Tools/index.html                   |  2 +-
 share/html/Admin/index.html                         |  2 +-
 share/html/Articles/Article/PreCreate.html          |  3 +--
 share/html/Articles/Article/Search.html             |  7 +++++++
 .../Elements/MaybeNeedsSetup}                       |  8 +++++---
 .../Portal => Articles/Elements/NeedsSetup}         |  8 ++++----
 share/html/Articles/index.html                      |  1 +
 share/html/Elements/Tabs                            | 17 +++++++++++------
 share/static/css/base/articles.css                  |  4 ++++
 share/static/css/base/forms.css                     | 10 ++++++++++
 t/articles/upload-customfields.t                    |  2 +-
 t/ticket/scrips_batch.t                             |  2 +-
 t/web/cf_access.t                                   |  4 ++--
 t/web/cf_date.t                                     |  4 ++--
 t/web/cf_datetime.t                                 |  2 +-
 t/web/cf_groupings_user.t                           |  2 +-
 t/web/cf_image.t                                    |  2 +-
 t/web/cf_onqueue.t                                  |  2 +-
 t/web/cf_render_type.t                              |  2 +-
 t/web/cf_select_one.t                               |  4 ++--
 t/web/cf_values_class.t                             |  2 +-
 t/web/class_create.t                                |  2 +-
 t/web/config_tab_right.t                            |  6 +++---
 t/web/group_create.t                                |  2 +-
 t/web/html_template.t                               |  4 ++--
 t/web/queue_create.t                                |  2 +-
 t/web/rights.t                                      |  2 +-
 t/web/rights1.t                                     |  4 ++--
 t/web/scrips.t                                      | 14 +++++++-------
 t/web/template.t                                    |  2 +-
 44 files changed, 124 insertions(+), 71 deletions(-)
 create mode 100644 etc/upgrade/4.1.12/content
 copy share/html/{Elements/TitleBoxStart => Articles/Elements/MaybeNeedsSetup} (92%)
 copy share/html/{Admin/Elements/Portal => Articles/Elements/NeedsSetup} (71%)

- Log -----------------------------------------------------------------
commit e03a393853aada63236421bd122fd605e39d3e85
Merge: aea36f9 36acf79
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri May 17 19:37:36 2013 -0400

    Merge branch '4.2/menus'
    
    Conflicts:
    	docs/UPGRADING-4.2
    	etc/upgrade/4.1.9/content
                Moved to etc/4.1.12/content
    	share/html/NoAuth/css/base/articles.css
    	t/web/html_template.t

diff --cc docs/UPGRADING-4.2
index 6021736,b031f18..8140102
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@@ -89,29 -89,9 +89,36 @@@ UPGRADING FROM RT 4.0.0 and greate
    This command deletes records from Transactions table. This script can only fix
    TimeWorked mismatch, but not TimeLeft or TimeEstimated.
  
 +* A new action, "Open Inactive Tickets", has been added, and on new
 +  installs the default scrip "On Correspond Open Tickets" has been
 +  replaced by "On Correspond Open Inactive Tickets".  The key difference
 +  between "Open Tickets" and "Open Inactive Tickets" is that the latter
 +  will not adjust the status of a ticket if it is already active.  This
 +  is particularly useful when creating complex workflows using
 +  Lifecycles.
 +
 +* CSS is no longer processed through Mason; it's served by a proper static file
 +  handler.  If you used the Begin or End callbacks of main.css in the aileron,
 +  web2, or ballard themes, you should transition to the @CSSFiles config option.
 +  If you need to target specific themes, you can use the class set on the <body>
 +  element (for example: body.aileron).  See docs/customizing/styling_rt.pd for
 +  more information on custom styles.
 +
 +* There are now HTML versions of the standard plain text templates.  Running
 +  make upgrade as described in the README will insert the new templates into
 +  existing installs.  While new installs use the HTML templates by default,
 +  upgrades from older versions don't automatically switch to the HTML versions.
 +  To switch existing scrips, run:
 +
 +    /opt/rt4/etc/upgrade/switch-templates-to html
 +
 +  To switch from HTML back to text, run:
 +
 +    /opt/rtr/etc/upgrade/switch-templates-to text
++
+ * The Articles menu is now a top-level menu item and display is controlled by
+   the right ShowArticlesMenu.  This right is only grantable globally to groups
+   or users.  During the upgrade, the new right will be automatically granted to
+   Privileged users so that the menu doesn't disappear for anyone previously
+   using it.  You may wish to revoke the right from Privileged and grant it
+   more selectively.
diff --cc etc/upgrade/4.1.12/content
index 0000000,1f370a2..1f370a2
mode 000000,100644..100644
--- a/etc/upgrade/4.1.12/content
+++ b/etc/upgrade/4.1.12/content
diff --cc share/static/css/base/articles.css
index 1473419,0000000..6e5a625
mode 100644,000000..100644
--- a/share/static/css/base/articles.css
+++ b/share/static/css/base/articles.css
@@@ -1,7 -1,0 +1,11 @@@
 +#comp-Articles-Article-Search .label h2 {
 +    text-align: left;
 +}
 +
 +.articles-select-article select {
 +    max-width: 20em;
 +}
++
++#articles-needs-setup a {
++    text-decoration: underline;
++}
diff --cc t/web/html_template.t
index cd9a031,abf68c5..192fd9a
--- a/t/web/html_template.t
+++ b/t/web/html_template.t
@@@ -13,8 -13,8 +13,8 @@@ diag('make Autoreply template a html on
    if $ENV{TEST_VERBOSE};
  
  {
-     $m->follow_link_ok( { id => 'tools-config-global-templates' },     '-> Templates' );
-     $m->follow_link_ok( { text => 'Autoreply in HTML' },       '-> Autoreply in HTML' );
 -    $m->follow_link_ok( { id => 'admin-global-templates' },     '-> Templates' );
 -    $m->follow_link_ok( { text => 'Autoreply' },     '-> Autoreply' );
++    $m->follow_link_ok( { id => 'admin-global-templates' }, '-> Templates' );
++    $m->follow_link_ok( { text => 'Autoreply in HTML' },    '-> Autoreply in HTML' );
  
      $m->submit_form(
          form_name => 'ModifyTemplate',
diff --cc t/web/scrips.t
index 726330a,6860e3e..c1b9782
--- a/t/web/scrips.t
+++ b/t/web/scrips.t
@@@ -195,21 -195,34 +195,21 @@@ note "check templates in scrip's admin 
      my ($status, $msg) = $template->Create( Queue => $queue_g->id, Name => 'foo' );
      ok $status, 'created a template';
  
 +    my $templates = RT::Templates->new( RT->SystemUser );
 +    $templates->LimitToGlobal;
 +
      my @default = (
            '',
 -          'Admin Comment',
 -          'Admin Correspondence',
 -          'Autoreply',
 -          'Blank',
 -          'Correspondence',
 -          'Email Digest',
 -          'Error to RT owner: public key',
 -          'Error: bad GnuPG data',
 -          'Error: Missing dashboard',
 -          'Error: no private key',
 -          'Error: public key',
 -          'Forward',
 -          'Forward Ticket',
 -          'PasswordChange',
 -          'Resolved',
 -          'Status Change',
 -          'Transaction'
 +          map $_->Name, @{$templates->ItemsArrayRef}
      );
  
-     $m->follow_link_ok( { id => 'tools-config-global-scrips-create' } );
+     $m->follow_link_ok( { id => 'admin-global-scrips-create' } );
      ok $m->form_name('CreateScrip');
      my @templates = ($m->find_all_inputs( type => 'option', name => 'Template' ))[0]
          ->possible_values;
 -    is_deeply(\@templates, \@default);
 +    is_deeply([sort @templates], [sort @default]);
  
-     $m->follow_link_ok( { id => 'tools-config-queues' } );
+     $m->follow_link_ok( { id => 'admin-queues' } );
      $m->follow_link_ok( { text => 'General' } );
      $m->follow_link_ok( { id => 'page-scrips-create' } );
  

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


More information about the Rt-commit mailing list