Add default text to create ticket

Thoma5 · Jan 30, 2017 · 3915887 · 3915887
1 parent d3a1335
commit 3915887
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/frontend/src/app/ui/ticket-detail/ticket-create/ticket-create.component.html b/frontend/src/app/ui/ticket-detail/ticket-create/ticket-create.component.html
@@ -6,6 +6,7 @@
     <div class="description">
       <tt-command-textview
           [initialContent]="'Description text...'"
+          [realInitialContent]="template"
           [projectId]="projectId"
           [activeTags]="activeTags"
           [assignedUsers]="assignedUsers"

diff --git a/frontend/src/app/ui/ticket-detail/ticket-create/ticket-create.component.ts b/frontend/src/app/ui/ticket-detail/ticket-create/ticket-create.component.ts
@@ -22,6 +22,7 @@ export class TicketCreateComponent {
   @Input() allTicketTags: imm.Map<string, CommandTextviewTicketTag>;
   @Input() allTimeCategories: imm.Map<string, CommandTextviewTimeCategory>;
   @Input() allAssignmentTags: imm.Map<string, CommandTextviewAssignmentTag>;
+  @Input() template: string = '';
   readonly activeTags = imm.List.of();
   readonly assignedUsers = imm.List.of();
 

diff --git a/frontend/src/app/ui/ticket-overview/ticket-overview.component.html b/frontend/src/app/ui/ticket-overview/ticket-overview.component.html
@@ -90,7 +90,7 @@ <h3 class="title">
           </div>
           <div class="body">
             <tt-ticket-create [projectId]="projectId" [allTicketTags]="allTicketTags" [allTimeCategories]="allTimeCategories" [allAssignmentTags]="allAssignmentTags"
-              (ticketAdd)="onTicketCreate($event)" [working]="createRunning">
+              (ticketAdd)="onTicketCreate($event)" [working]="createRunning" [template]="newTicketTemplate">
             </tt-ticket-create>
           </div>
         </div>

diff --git a/frontend/src/app/ui/ticket-overview/ticket-overview.component.ts b/frontend/src/app/ui/ticket-overview/ticket-overview.component.ts
@@ -9,7 +9,7 @@ import {
   AssignmentTagResultJson, UserResultJson, TicketTagResultJson,
   TimeCategoryJson,
   TickettagApi, TicketuserrelationApi, TickettagrelationApi, ProjectApi,
-  TimecategoryApi
+  TimecategoryApi, ProjectResultJson
 } from '../../api';
 import {
   TicketOverview, TicketOverviewTag, TicketOverviewAssTag, TicketOverviewUser,
@@ -46,6 +46,7 @@ export class TicketOverviewComponent implements OnInit {
   private filterTerms = new Subject<TicketFilter>();
   private ticketFilter: TicketFilter = new TicketFilter(undefined, undefined, undefined, undefined, undefined,
     undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+  private newTicketTemplate: string = '';
   sortprop = ['NUMBER_ASC'];
   offset = 0;
   limit = 30;
@@ -178,8 +179,11 @@ export class TicketOverviewComponent implements OnInit {
     let timeCategoriesObs = this.allTimeCategories ? Observable.of(this.allTimeCategories) : this.apiCallService
       .callNoError<TimeCategoryJson[]>(p => this.timeCategoryApi.listProjectTimeCategoriesUsingGETWithHttpInfo(this.projectId, p))
       .map(tcs => idListToMap(tcs).map(tc => new TicketOverviewTimeCategory(tc)).toMap());
+    let newTicketTemplateObs = this.apiCallService
+      .callNoError<ProjectResultJson>(p => this.projectApi.getProjectUsingGETWithHttpInfo(this.projectId, p))
+      .map(p => p.ticketTemplate);
     return Observable
-      .zip(rawTicketObs, assignmentTagsObs, ticketTagsObs, projectUsersObs, timeCategoriesObs)
+      .zip(rawTicketObs, assignmentTagsObs, ticketTagsObs, projectUsersObs, timeCategoriesObs, newTicketTemplateObs)
       .do(
       tuple => {
         if (!this.loading) {
@@ -190,6 +194,7 @@ export class TicketOverviewComponent implements OnInit {
         this.allProjectUsers = tuple[3];
         this.allTimeCategories = tuple[4];
         this.totalElements = tuple[0].totalElements;
+        this.newTicketTemplate = tuple[5];
         this.tickets = [];
         const start = this.offset * this.limit;
         const end = start + this.limit;

diff --git a/frontend/src/app/util/command-textview/command-textview.component.html b/frontend/src/app/util/command-textview/command-textview.component.html
@@ -1,3 +1,3 @@
 <div class="editor">
-  <textarea id="command-text" placeholder="{{initialContent || ''}}"></textarea>
+  <textarea id="command-text" placeholder="{{initialContent || ''}}">{{realInitialContent}}</textarea>
 </div><div (window:keydown)="scrollToCommentInput($event)" style="display:none"></div>
diff --git a/frontend/src/app/util/command-textview/command-textview.component.ts b/frontend/src/app/util/command-textview/command-textview.component.ts
@@ -63,6 +63,7 @@ export class CommandTextviewComponent implements AfterViewInit, OnChanges, OnDes
     @Input() resetEventObservable: Observable<string> | null = null;
     @Input() noCommands: boolean = false;
     @Input() hasShortcut: boolean = false;
+    @Input() realInitialContent: string = '';
 
     @Output() readonly contentChange = new EventEmitter<CommandTextviewSaveEvent>();
     @Output() readonly save = new EventEmitter<void>();
@@ -104,12 +105,16 @@ export class CommandTextviewComponent implements AfterViewInit, OnChanges, OnDes
                 }, 100);
             }
         });
+        this.instance.setValue(this.realInitialContent || '');
     }
 
     ngOnChanges(changes: SimpleChanges): void {
         if ('resetEventObservable' in changes) {
             this.resubscribeResetEvent();
         }
+        if (this.instance && 'realInitialContent' in changes) {
+            this.instance.setText(this.realInitialContent);
+        }
     }
 
     ngOnDestroy(): void {