[Rt-commit] rt branch, 4.4/core-assets, repushed

[Todd Wade]

The branch 4.4/core-assets was deleted and repushed:
       was 1e8dc8f2b9de3fb07d92c676cd22c895798e589d
       now 4e652c42e9b05adaedab07852934c7ce11c4df42

1:  1e8dc8f ! 1:  4e652c4 core RT::Extension::Assets
    @@ -6,9 +6,9 @@
     --- a/.gitignore
     +++ b/.gitignore
     @@
    - /etc/upgrade/switch-templates-to
      /etc/upgrade/time-worked-history
      /etc/upgrade/upgrade-articles
    + /etc/upgrade/upgrade-sla
     +/etc/upgrade/upgrade-assets
      /etc/upgrade/vulnerable-passwords
      /lib/RT/Generated.pm
    @@ -23,8 +23,8 @@
                       etc/upgrade/upgrade-articles
     +                 etc/upgrade/upgrade-assets
                       etc/upgrade/vulnerable-passwords
    +                  etc/upgrade/upgrade-sla
                       sbin/rt-attributes-viewer
    -                  sbin/rt-preferences-viewer
     
     diff --git a/docs/assets.pod b/docs/assets.pod
     new file mode 100644
    @@ -678,8 +678,8 @@
      Set(
          $HomepageComponents,
          [
    --        qw(QuickCreate Quicksearch MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards SavedSearches FindUser) # loc_qw
    -+        qw(QuickCreate Quicksearch MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards SavedSearches FindUser MyAssets FindAsset) # loc_qw
    +-        qw(QuickCreate QueueList MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards SavedSearches FindUser) # loc_qw
    ++        qw(QuickCreate QueueList MyAdminQueues MySupportQueues MyReminders RefreshHomepage Dashboards SavedSearches FindUser MyAssets FindAsset) # loc_qw
          ]
      );
      
    @@ -820,9 +820,6 @@
                  'deleted -> open'  => { label  => 'Undelete',                    }, # loc{label}
              ],
          },
    --);
    --
    --
     +    assets => {
     +        type     => "asset",
     +        initial  => [ 
    @@ -837,11 +834,11 @@
     +            'stolen', # loc
     +            'deleted' # loc
     +        ],
    - 
    ++
     +        defaults => {
     +            on_create => 'new',
     +        },
    - 
    ++
     +        transitions => {
     +            ''        => [qw(new allocated in-use)],
     +            new       => [qw(allocated in-use stolen deleted)],
    @@ -869,10 +866,9 @@
     +            },
     +        },
     +    },
    -+);
    - 
    - =head1 Administrative interface
    - 
    + # don't change lifecyle of the approvals, they are not capable to deal with
    + # custom statuses
    +     approvals => {
     @@
              q{ '<a href="__WebPath__/Admin/Articles/Classes/Modify.html?id=__id__">__id__</a>/TITLE:#'}
              .q{,'<a href="__WebPath__/Admin/Articles/Classes/Modify.html?id=__id__">__Name__</a>/TITLE:Name'}
    @@ -925,12 +921,6 @@
      @ScripActions = (
      
          {  Name        => 'Autoreply To Requestors',    # loc
    -@@
    -         },
    -     },
    - );
    -+
    -+1;
     
     diff --git a/etc/schema.Oracle b/etc/schema.Oracle
     --- a/etc/schema.Oracle
    @@ -1132,13 +1122,12 @@
     +1;
     
     diff --git a/etc/upgrade/4.3.10/content b/etc/upgrade/4.3.10/content
    -new file mode 100644
    ---- /dev/null
    +--- a/etc/upgrade/4.3.10/content
     +++ b/etc/upgrade/4.3.10/content
     @@
    -+use strict;
    -+use warnings;
    -+
    +     },
    + );
    + 
     +require RT::Asset;
     +
     +our @Catalogs;
    @@ -1172,7 +1161,6 @@
     +    }
     +};
     +
    -+1;
     
     diff --git a/etc/upgrade/4.3.10/schema.Oracle b/etc/upgrade/4.3.10/schema.Oracle
     new file mode 100644
    @@ -3215,11 +3203,11 @@
     @@
      
          # Slurp in stuff to insert from the datafile. Possible things to go in here:-
    -     our (@Groups, @Users, @Members, @ACL, @Queues, @ScripActions, @ScripConditions,
    +     our (@Groups, @Users, @Members, @ACL, @Queues, @Classes, @ScripActions, @ScripConditions,
     -           @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final);
     +           @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final,
     +           @Catalogs, @Assets);
    -     local (@Groups, @Users, @Members, @ACL, @Queues, @ScripActions, @ScripConditions,
    +     local (@Groups, @Users, @Members, @ACL, @Queues, @Classes, @ScripActions, @ScripConditions,
     -           @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final);
     -
     +           @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final,
    @@ -3274,13 +3262,13 @@
     --- a/lib/RT/Interface/Web.pm
     +++ b/lib/RT/Interface/Web.pm
     @@
    -       forms.js
    -       event-registration.js
            late.js
    +       mousetrap.min.js
    +       keyboard-shortcuts.js
     +      assets.js
            /static/RichText/ckeditor.js
    +       dropzone.min.js
            }, RT->Config->Get('JSFiles');
    - }
     @@
          return @map;
      }
    @@ -3772,9 +3760,9 @@
     --- a/lib/RT/Transaction.pm
     +++ b/lib/RT/Transaction.pm
     @@
    -             "#reminder-", $ticket->id, \'">', $ticket->Subject, \'</a>'
    -         ];
    -         return ("Reminder '[_1]' completed", $subject); #loc()
    +         } else {
    +             return ("Reminder completed"); #loc()
    +         }
     -    }
     +    },
     +    'RT::Asset-Set-Catalog' => sub {
    @@ -9138,7 +9126,7 @@
     --- a/share/html/Ticket/Create.html
     +++ b/share/html/Ticket/Create.html
     @@
    -       <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1, KeepValue => 1, &>
    +       <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1 &>
          </table>
        </&>
     +