Checkin, fairly stable

This commit is contained in:
Rich Lott / Artful Robot 2025-03-26 13:29:55 +00:00
parent f88fb5f10e
commit eb6542857b
5 changed files with 161 additions and 119 deletions

View file

@ -66,7 +66,7 @@
<button ng-if="$ctrl.moveIdx === null && row.deleted" ng-click="row.deleted = false;$ctrl.dirty = 'dirty';">
<i class="fa-trash crm-i"></i> {{ts('Un-Delete')}}
</button>
<button ng-if="$ctrl.moveIdx === null && !row.deleted && row.search_type !== 'default'" ng-click="$ctrl.moveIdx = idx"
<button ng-if="$ctrl.moveIdx === null && !row.deleted && !(row.search_type === 'default' && $ctrl.uxOrderField === 'execution_order')" ng-click="$ctrl.moveIdx = idx"
class="btn"
ng-disabled="$ctrl.presentation_order.length === 1"
>
@ -78,7 +78,8 @@
<i class="fa-circle-xmark crm-i"></i> {{ts('Cancel Move')}}
</button>
<button ng-click="$ctrl.moveTo(idx)" ng-show="$ctrl.moveIdx !== null && (idx === 0 && $ctrl.moveIdx > 0)" ><i class="fa-sort-up crm-i" ></i>{{ts('Before this')}}</button>
<button ng-click="$ctrl.moveTo(idx+1)" ng-show="$ctrl.moveIdx !== null && row.search_type !== 'default' && (idx + 1 < $ctrl.moveIdx || idx > $ctrl.moveIdx)"><i class="fa-sort-down crm-i" ></i>{{ts('After this')}}</button>
<button ng-click="$ctrl.moveTo(idx+1)" ng-show="$ctrl.canMoveBelow(row, idx)"
><i class="fa-sort-down crm-i" ></i>{{ts('After this')}}</button>
</span>
</div>
</div>
@ -156,11 +157,13 @@
name="search_type"
ng-model="$ctrl.categoryToEdit.search_type"
ng-change="$ctrl.fixSearchData()"
ng-show="$ctrl.categoryToEdit.search_type !== 'default'"
>
<option value="search" >{{ts('Search Kit search')}}</option>
<option value="group" >{{ts('Group')}}</option>
<!-- future? <option value="sql_template" >{{ts('SQL template')}}</option> -->
</select>
<div ng-show="$ctrl.categoryToEdit.search_type === 'default'" >{{ts('Default category')}}</div>
</div>
<!-- fields for search kit -->