[Rt-commit] rt branch, 4.4/core-assets, updated. rt-4.2.11-46-ga3264ce

[Todd Wade]

The branch, 4.4/core-assets has been updated
       via  a3264ced4003d0302bd11b0b069a92da33c81717 (commit)
       via  b1ce73f8a1ee577534833eb44c66797bd296c1e8 (commit)
      from  192a09e0466e7e8ec3b97343de1d16106a3bebab (commit)

Summary of changes:
 docs/customizing/assets/tutorial.pod | 28 ++++++++++++----------------
 t/api/template-parsing.t             |  2 +-
 t/web/case-sensitivity.t             |  2 +-
 t/web/rest_user_cf.t                 |  2 +-
 4 files changed, 15 insertions(+), 19 deletions(-)

- Log -----------------------------------------------------------------
commit b1ce73f8a1ee577534833eb44c66797bd296c1e8
Author: Todd Wade <todd at bestpractical.com>
Date:   Tue Oct 20 08:39:11 2015 -0400

    fix the (hopefully) last vestiges of references to the extension

diff --git a/docs/customizing/assets/tutorial.pod b/docs/customizing/assets/tutorial.pod
index 6da629f..8418ab1 100644
--- a/docs/customizing/assets/tutorial.pod
+++ b/docs/customizing/assets/tutorial.pod
@@ -16,9 +16,7 @@ alt="Asset Search Results" /></p>
 You can follow along with the tutorial and try setting things up yourself to
 get a feel for all of the administrative controls. If you want to get a jump
 start, the files to set up this basic configuration are provided in the
-F<docs/customizing/assets> directory. For configuration, look in
-F<docs/customizing/Tutorial_Configuration.txt>. You can copy all or part of it
-and paste it into your F<RT_SiteConfig.pm>.
+F<docs/customizing/assets> directory.
 
 To load the test catalog, custom fields, and users, run the following from
 your RT directory:
@@ -45,18 +43,16 @@ to RT's pages. MyAssets and FindAsset portlets are available for placement on
 RT at a Glance or in dashboards and a UserAssets portlet is available for the
 user summary pages.
 
-These portlets are fairly self-explanatory and you can add them by finding
-C<$HomepageComponents> and C<@UserSummaryPortlets> respectively in
-F<RT_Config.pm>, copying to F<RT_SiteConfig.pm>, and adding the portlets you
-want. There are also examples in the tutorial sample configuration file. Note
-that C<$HomepageComponents> makes the portlets available, but doesn't put them
-on RT at a Glance. To add them, just click the Edit link on the upper right-hand
-corner of the homepage. C<@UserSummaryPortlets> does automatically add the
-"Assigned Assets" portlet to the User Summary page. It will appear based on the
-position in the configuration, so just place it in the list where you want it
-to appear.
-
-Once you have your configuration complete, restart your server and you're ready
+These portlets are fairly self-explanatory and for reference you can find them
+in C<$HomepageComponents> and C<@UserSummaryPortlets> respectively in
+F<RT_Config.pm>. Note that C<$HomepageComponents> makes the portlets available,
+but doesn't put them on RT at a Glance. To add them, just click the Edit link on
+the upper right-hand corner of the homepage. C<@UserSummaryPortlets> does
+automatically add the "Assigned Assets" portlet to the User Summary page. It
+will appear based on the position in the configuration, so to move it rearrange
+the list to where you want it to appear.
+
+If you've made any configuration changes, restart your server and you're ready
 to go.
 
 =head1 Catalogs
@@ -168,7 +164,7 @@ When the current support contract expires.
 
 Any custom fields you create will be displayed on the asset display page in a
 default "Custom Fields" section. That may be sufficient, but assets also
-supports RT's new custom field grouping feature, so we can group together some
+supports RT's custom field grouping feature, so we can group together some
 similar custom fields and give them a custom name. If we add the following to
 F<RT_SiteConfig.pm>:
 

commit a3264ced4003d0302bd11b0b069a92da33c81717
Author: Todd Wade <todd at bestpractical.com>
Date:   Tue Oct 20 08:40:00 2015 -0400

    fix tests (root is now getting id 14 instead of 12 as id?)

diff --git a/t/api/template-parsing.t b/t/api/template-parsing.t
index 5701772..a760c21 100644
--- a/t/api/template-parsing.t
+++ b/t/api/template-parsing.t
@@ -74,7 +74,7 @@ SimpleTemplateTest(
 
 SimpleTemplateTest(
     Content => "\ntest { \$TicketOwnerId }",
-    Output  => "test 12",
+    Output  => "test 14",
 );
 
 SimpleTemplateTest(
diff --git a/t/web/case-sensitivity.t b/t/web/case-sensitivity.t
index 7599371..a0a7908 100644
--- a/t/web/case-sensitivity.t
+++ b/t/web/case-sensitivity.t
@@ -22,7 +22,7 @@ $m->login;
     require JSON;
     is_deeply(
         JSON::from_json( $m->content ),
-        [{id => 12, "value" =>  "root\@localhost","label" => "root (Enoch Root)"}]
+        [{id => 14, "value" =>  "root\@localhost","label" => "root (Enoch Root)"}]
     );
 }
 
diff --git a/t/web/rest_user_cf.t b/t/web/rest_user_cf.t
index d9f4ea3..c74ac07 100644
--- a/t/web/rest_user_cf.t
+++ b/t/web/rest_user_cf.t
@@ -19,7 +19,7 @@ $root->AddCustomFieldValue( Field => 'foo', Value => 'blabla' );
 is( $root->FirstCustomFieldValue('foo'), 'blabla', 'cf is set' );
 
 ok( $m->login, 'logged in' );
-$m->post( "$baseurl/REST/1.0/show", [ id => 'user/12', ] );
+$m->post( "$baseurl/REST/1.0/show", [ id => 'user/14', ] );
 like( $m->content, qr/CF-foo: blabla/, 'found the cf' );
 
 undef $m;

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