From: Mike Risher <mrisher@catalyte.io>
Date: Tue, 6 Oct 2020 19:57:54 +0000 (+0000)
Subject: Merge branch 'master' into user/mrisher/lp1855780-notification-action-triggers-v5
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fe75fd3994bcd4b73d583a3e282008d121328a72;p=working%2FEvergreen.git

Merge branch 'master' into user/mrisher/lp1855780-notification-action-triggers-v5
---

fe75fd3994bcd4b73d583a3e282008d121328a72
diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
index 970f7c3ba0,970f7c3ba0..d5824fea86
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
@@@ -1,6 -1,6 +1,9 @@@
  <eg-staff-banner bannerText="{{this.evtDefName}}" i18n-bannerText>
  </eg-staff-banner>
--<ul ngbNav #editNav="ngbNav" class="nav-tabs mb-3"
++<div class="text-center">
++    <button class="btn btn-outline-dark" (click)="back()">&#8592; Back to Notifications/Action Triggers</button>
++</div>
++<ul ngbNav #editNav="ngbNav" class="nav-tabs mb-3 mt-3"
      [activeId]="editTab" (navChange)="onTabChange($event)">
      <li [ngbNavItem]="'def'">
          <a ngbNavLink i18n>Edit Definition</a>
@@@ -17,6 -17,6 +20,9 @@@
                  [fieldOptions]="{message_template:{customTemplate:{template:textAreaTemplate}},template:{customTemplate:{template:textAreaTemplate}}}"
                  fieldOrder="owner,name,hook,active,delay,delay_field,group_field,reactor,validator,repeat_delay,id,cleanup_failure,granularity,max_delay,message_library_path,message_template,message_title,message_usr_path,opt_in_setting,usr_field,retention_interval,cleanup_success,template">
              </eg-fm-record-editor>
++            <div class="text-right">
++                <button class="btn btn-outline-dark mr-3" (click)="back()">&#8592; Back to Notifications/Action Triggers</button>
++            </div>
          </ng-template>
      </li>
      <li ngbNavItem="'env'">
diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.ts
index a659d639ad,a659d639ad..f9bf28ff01
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.ts
@@@ -11,6 -11,6 +11,7 @@@ import {FmRecordEditorComponent} from '
  import {StringComponent} from '@eg/share/string/string.component';
  import {ToastService} from '@eg/share/toast/toast.service';
  import {NgbNav, NgbNavChangeEvent} from '@ng-bootstrap/ng-bootstrap';
++import {Router} from '@angular/router';
  
  @Component({
      templateUrl: './trigger-edit.component.html'
@@@ -47,6 -47,6 +48,7 @@@ export class EditEventDefinitionCompone
      @ViewChild('createErrString') createErrString: StringComponent;
  
      constructor(
++        private router: Router,
          private idl: IdlService,
          private pcrud: PcrudService,
          private toast: ToastService,
@@@ -196,4 -196,4 +198,8 @@@
          this.testErr2 = '';
          this.testResult = '';
      }
++
++    back = () => {
++        this.router.navigate(['/staff/admin/local/action_trigger/event_definition/']);
++    }
  }