tweak

Signed-off-by: Jason Etheridge <phasefx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html
index 73b8d22..fcc9c65 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.html
+++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.html
@@ -27,7 +27,7 @@
     <div class="eg-tree-node" [ngClass]="{active : node.selected}">
       <a [routerLink]="" (click)="handleNodeClick(node)">{{node.label}}</a>
     </div>
-    <ng-container *ngTemplateOutlet="selectedRowTrailingTemplate; context: {$implicit: node}"></ng-container>
+    <ng-container *ngTemplateOutlet="rowTrailingTemplate; context: {$implicit: node}"></ng-container>
   </div>
 </div>
 <ng-content select="[footer]"></ng-content>

diff --git a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts
index 324da2e..699ccac 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/tree/tree.component.ts
@@ -53,7 +53,7 @@ export class TreeComponent {
     @Input() showSelectors: boolean = false; // the checkboxes, etc.
     @Input() disableRootSelector: boolean = false; // checkbox at the top of the tree
     @Input() toggleOnClick: boolean = false; // selectNode vs toggleNodeSelection
-    @Input() selectedRowTrailingTemplate: TemplateRef<any>;
+    @Input() rowTrailingTemplate: TemplateRef<any>;
 
     @Output() nodeClicked: EventEmitter<TreeNode>;
     @Output() nodeChecked: EventEmitter<TreeNode>;

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/custom-org-unit-trees.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/custom-org-unit-trees.component.html
index e285924..a76f2cb 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/custom-org-unit-trees.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/custom-org-unit-trees.component.html
@@ -37,10 +37,12 @@
     <h3 i18n>Custom Org Unit Tree</h3>
     <div class="border rounded p-1" >
       <ng-template #selectedRowButtons let-node>
-          <button type="button" class="btn btn-link" [disabled]="deleteNodesDisabled" (click)="deleteNode(node)" i18n>Delete</button>
+        <div *ngIf="node.selected">
           <button type="button" class="btn btn-link" [disabled]="moveNodeUpDisabled" (click)="moveNodeUp(node)" i18n>Up</button>
           <button type="button" class="btn btn-link" [disabled]="moveNodeDownDisabled" (click)="moveNodeDown(node)" i18n>Down</button>
           <button type="button" class="btn btn-link" [disabled]="moveNodeElsewhereDisabled" (click)="moveNodeElsewhere(node)" i18n>Move</button>
+          <button type="button" class="btn btn-link" [disabled]="deleteNodesDisabled" (click)="deleteNode(node)" i18n>Delete</button>
+        </div>
       </ng-template>
       <eg-tree
         [showTogglers]="true"
@@ -50,7 +52,7 @@
         [tree]="custom_tree"
         (nodeClicked)="custom_nodeClicked($event)"
         (nodeChecked)="custon_nodeChecked($event)"
-        [selectedRowTrailingTemplate]="selectedRowButtons">
+        [rowTrailingTemplate]="selectedRowButtons">
         <div header>
         </div>
         <div footer>