Merge pull request #2 from moqui/master

Merge from moqui/moqui-runtime
moqui · May 23, 2019 · da07e6d · da07e6d
2 parents 4f76e69 + 47b846f
commit da07e6d
Show file tree

Hide file tree

Showing 24 changed files with 119 additions and 85 deletions.
diff --git a/base-component/tools/screen/System/AuditLog.xml b/base-component/tools/screen/System/AuditLog.xml
@@ -15,31 +15,30 @@ along with this software (see the LICENSE.md file). If not, see
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
         default-menu-title="Audit Log" default-menu-index="4">
 
-    <actions>
-        <entity-find entity-name="moqui.entity.EntityAuditLog" list="entityAuditLogList" limit="50">
-            <search-form-inputs default-order-by="-changedDate"/>
-        </entity-find>
-    </actions>
     <widgets>
-        <form-list name="EntityAuditLogList" list="entityAuditLogList">
+        <form-list name="EntityAuditLogList" list="entityAuditLogList" header-dialog="true">
+            <entity-find entity-name="moqui.entity.EntityAuditLog" list="entityAuditLogList" limit="50">
+                <search-form-inputs default-order-by="-changedDate" require-parameters="true"/>
+            </entity-find>
+
             <field name="changedDate">
-                <header-field title="Date" show-order-by="true"><text-find hide-options="true" size="12"/></header-field>
+                <header-field title="Date" show-order-by="true"><date-period time="true"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="changedEntityName">
-                <header-field title="Entity" show-order-by="true"><text-find hide-options="true" size="6"/></header-field>
+                <header-field title="Entity" show-order-by="true"><text-find size="80" default-operator="equals"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="changedFieldName">
-                <header-field title="Field" show-order-by="true"><text-find hide-options="true" size="6"/></header-field>
+                <header-field title="Field" show-order-by="true"><text-find size="30" default-operator="equals"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="pkPrimaryValue">
-                <header-field title="PK 1" show-order-by="true"><text-find hide-options="true" size="6"/></header-field>
+                <header-field title="PK 1" show-order-by="true"><text-find size="30" default-operator="equals"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="pkSecondaryValue">
-                <header-field title="PK 2"><text-find hide-options="true" size="4"/></header-field>
+                <header-field title="PK 2"><text-find size="30" default-operator="equals"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <!--
@@ -49,19 +48,19 @@ along with this software (see the LICENSE.md file). If not, see
             </field>
             -->
             <field name="oldValueText">
-                <header-field title="Old" show-order-by="true"><text-find hide-options="true" size="10"/></header-field>
+                <header-field title="Old" show-order-by="true"><text-find size="60" default-operator="begins"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="newValueText">
-                <header-field title="New" show-order-by="true"><text-find hide-options="true" size="10"/></header-field>
+                <header-field title="New" show-order-by="true"><text-find size="60" default-operator="begins"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="changedByUserId">
-                <header-field title="User" show-order-by="true"><text-find hide-options="true" size="6"/></header-field>
+                <header-field title="User" show-order-by="true"><text-find size="20" default-operator="begins"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="changedInVisitId">
-                <header-field title="Visit" show-order-by="true"><text-find hide-options="true" size="6"/></header-field>
+                <header-field title="Visit" show-order-by="true"><text-find size="20" default-operator="begins"/></header-field>
                 <default-field><display also-hidden="false"/></default-field>
             </field>
             <field name="find"><header-field title="Find"><submit/></header-field>

diff --git a/base-component/tools/screen/System/Cache/CacheElements.xml b/base-component/tools/screen/System/Cache/CacheElements.xml
@@ -26,7 +26,7 @@ along with this software (see the LICENSE.md file). If not, see
                 while (iter.hasNext()) {
                     javax.cache.Cache.Entry entry = iter.next()
                     if (key == (entry.key as String)) {
-                        cacheValue = theCache.getAndRemove(key)
+                        cacheValue = theCache.getAndRemove(entry.key)
                         ec.message.addMessage(ec.resource.expand('Cleared ${key} from cache [${cacheName}] had value [${cacheValue}]',''))
                         return
                     }

diff --git a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml
@@ -48,7 +48,7 @@ along with this software (see the LICENSE.md file). If not, see
         </iterate>
     </actions>
     <widgets>
-        <container-box><box-header><label text="Conditions" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Conditions"/><box-toolbar>
             <container-dialog id="AddConditionDialog" button-text="Add Condition">
                 <form-single name="AddCondition" transition="createDataDocumentCondition">
                     <field name="dataDocumentId"><default-field><hidden/></default-field></field>
@@ -86,7 +86,7 @@ along with this software (see the LICENSE.md file). If not, see
             </form-list>
         </box-body-nopad></container-box>
 
-        <container-box><box-header><label text="Fields" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Fields"/><box-toolbar>
             <container-dialog id="AddFieldDialog" button-text="Add Field Manual">
                 <form-single name="AddField" transition="createDataDocumentField">
                     <field name="dataDocumentId"><default-field><hidden/></default-field></field>

diff --git a/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml b/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml
@@ -71,7 +71,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
             </form-single>
         </row-col><row-col lg="7">
-            <container-box><box-header><label text="User Groups" type="h5"/></box-header><box-toolbar>
+            <container-box><box-header title="User Groups"/><box-toolbar>
                 <container-dialog id="AddGroupDialog" button-text="Add Group">
                     <form-single name="AddUserGroup" transition="createDataDocumentUserGroup">
                         <field name="dataDocumentId"><default-field><hidden/></default-field></field>
@@ -98,7 +98,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </form-list>
             </box-body-nopad></container-box>
 
-            <container-box><box-header><label text="Data Feeds" type="h5"/></box-header><box-toolbar>
+            <container-box><box-header title="Data Feeds"/><box-toolbar>
                 <container-dialog id="AddFeedDialog" button-text="Add Feed">
                     <form-single name="AddDataFeed" transition="createDataFeedDocument">
                         <field name="dataDocumentId"><default-field><hidden/></default-field></field>
@@ -125,7 +125,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </form-list>
             </box-body-nopad></container-box>
         </row-col></container-row>
-        <container-box><box-header><label text="Links" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Links"/><box-toolbar>
             <container-dialog id="AddLinkDialog" button-text="Add Link">
                 <form-single name="AddLink" transition="createDataDocumentLink">
                     <field name="dataDocumentId"><default-field><hidden/></default-field></field>

diff --git a/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml b/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml
@@ -75,7 +75,7 @@ along with this software (see the LICENSE.md file). If not, see
             </row-col>
             <row-col lg="7">
                 <container-box>
-                    <box-header><label text="Artifact Groups (includes entities only)" type="h5"/></box-header>
+                    <box-header title="Artifact Groups (includes entities only)"/>
                     <box-toolbar>
                         <container-dialog id="AddAuthzDialog" button-text="Add Artifact Group">
                             <form-single name="CreateEntitySyncArtifact" transition="createEntitySyncArtifact">

diff --git a/base-component/tools/screen/System/Instance/InstanceDetail.xml b/base-component/tools/screen/System/Instance/InstanceDetail.xml
@@ -74,7 +74,7 @@ along with this software (see the LICENSE.md file). If not, see
         </if>
     </actions>
     <widgets><container-row><row-col md="7">
-        <container-box><box-header><label text="App Instance ${appInstance.appInstanceId}" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="App Instance ${appInstance.appInstanceId}"/><box-toolbar>
             <link url="provisionAppInstance" text="Provision App" parameter-map="[appInstanceId:appInstanceId]"
                   condition="!instanceExists &amp;&amp; !databaseExists"/>
 
@@ -154,7 +154,7 @@ along with this software (see the LICENSE.md file). If not, see
             </form-single>
         </box-body></container-box>
     </row-col><row-col md="5">
-        <container-box><box-header><label text="Environment Variables" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Environment Variables"/><box-toolbar>
             <container-dialog id="AddEnvDialog" button-text="Add Env Var">
                 <form-single name="AddEnv" transition="createAppInstanceEnv">
                     <field name="appInstanceId"><default-field><hidden/></default-field></field>
@@ -177,7 +177,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </default-field></field>
             </form-list>
         </box-body-nopad></container-box>
-        <container-box><box-header><label text="Volumes" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Volumes"/><box-toolbar>
             <container-dialog id="AddVolDialog" button-text="Add Volume">
                 <form-single name="AddVol" transition="createAppInstanceVol">
                     <field name="appInstanceId"><default-field><hidden/></default-field></field>
@@ -200,7 +200,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </default-field></field>
             </form-list>
         </box-body-nopad></container-box>
-        <container-box><box-header><label text="Instance (Container) Links" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Instance (Container) Links"/><box-toolbar>
             <container-dialog id="AddLinkDialog" button-text="Add Link">
                 <form-single name="AddLink" transition="createAppInstanceLink">
                     <field name="appInstanceId"><default-field><hidden/></default-field></field>

diff --git a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml
@@ -61,7 +61,7 @@ along with this software (see the LICENSE.md file). If not, see
             <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
         </form-single>
         <container-box>
-            <box-header><label text="Artifact Members" type="h5"/></box-header>
+            <box-header title="Artifact Members"/>
             <box-toolbar>
                 <container-dialog id="AddMemberDialog" button-text="Add Any Artifact/Pattern">
                     <form-single name="CreateArtifactGroupMember" transition="createArtifactGroupMember">
@@ -113,7 +113,7 @@ along with this software (see the LICENSE.md file). If not, see
         </container-box>
 
         <container-box>
-            <box-header><label text="Authorizations" type="h5"/></box-header>
+            <box-header title="Authorizations"/>
             <box-toolbar>
                 <container-dialog id="AddAuthzDialog" button-text="Add Authorization">
                     <form-single name="CreateArtifactAuthz" transition="createArtifactAuthz">
@@ -194,7 +194,7 @@ along with this software (see the LICENSE.md file). If not, see
         </container-box>
 
         <container-box>
-            <box-header><label text="Tarpits (Use Velocity Limits)" type="h5"/></box-header>
+            <box-header title="Tarpits (Use Velocity Limits)"/>
             <box-toolbar>
                 <container-dialog id="AddTarpitDialog" button-text="Add Tarpit">
                     <form-single name="CreateArtifactTarpit" transition="createArtifactTarpit">

diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
@@ -139,7 +139,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </form-single>
             </row-col>
             <row-col lg="7">
-                <container-box><box-header><label text="Groups" type="h5"/></box-header><box-toolbar>
+                <container-box><box-header title="Groups"/><box-toolbar>
                     <container-dialog id="AddGroupMemberDialog" button-text="Add Group">
                         <form-single name="CreateUserGroupMember" transition="createUserGroupMember">
                             <field name="userId"><default-field><hidden/></default-field></field>
@@ -174,7 +174,7 @@ along with this software (see the LICENSE.md file). If not, see
                     </form-list>
                 </box-body-nopad></container-box>
 
-                <container-box><box-header><label text="Preferences" type="h5"/></box-header><box-toolbar>
+                <container-box><box-header title="Preferences"/><box-toolbar>
                     <container-dialog id="AddPreferenceDialog" button-text="Add Existing Preference">
                         <form-single name="CreateUserPreference" transition="createUserPreference">
                             <field name="userId"><default-field><hidden/></default-field></field>

diff --git a/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml b/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
@@ -79,7 +79,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
             </form-single>
 
-            <container-box><box-header><label text="Permissions" type="h5"/></box-header><box-toolbar>
+            <container-box><box-header title="Permissions"/><box-toolbar>
                 <container-dialog id="AddAdHocPermissionDialog" button-text="Apply Ad-hoc Permission">
                     <form-single name="CreateAdHocUserGroupPermission" transition="createUserGroupPermission">
                         <field name="userGroupId"><default-field><hidden/></default-field></field>
@@ -127,7 +127,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </form-list>
             </box-body></container-box>
         </row-col><row-col lg="6">
-            <container-box><box-header><label text="Preferences" type="h5"/></box-header><box-toolbar>
+            <container-box><box-header title="Preferences"/><box-toolbar>
                 <container-dialog id="AddPreferenceDialog" button-text="Add Existing Preference">
                     <form-single name="CreateUserPreference" transition="createUserGroupPreference">
                         <field name="userGroupId"><default-field><hidden/></default-field></field>
@@ -164,7 +164,7 @@ along with this software (see the LICENSE.md file). If not, see
             </box-body></container-box>
         </row-col></container-row>
 
-        <container-box><box-header><label text="Authorizations" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Authorizations"/><box-toolbar>
             <container-dialog id="AddAuthzDialog" button-text="Add Authorization">
                 <form-single name="CreateArtifactAuthz" transition="createArtifactAuthz"
                         extends="component://tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml#CreateArtifactAuthz">
@@ -190,7 +190,7 @@ along with this software (see the LICENSE.md file). If not, see
             </form-list>
         </box-body></container-box>
 
-        <container-box><box-header><label text="Tarpits (Use Velocity Limits)" type="h5"/></box-header><box-toolbar>
+        <container-box><box-header title="Tarpits (Use Velocity Limits)"/><box-toolbar>
             <container-dialog id="AddTarpitDialog" button-text="Add Tarpit">
                 <form-single name="CreateArtifactTarpit" transition="createArtifactTarpit"
                         extends="component://tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml#CreateArtifactTarpit">

diff --git a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
@@ -52,7 +52,7 @@ along with this software (see the LICENSE.md file). If not, see
     </actions>
     <widgets>
         <container-row><row-col md="6">
-            <container-box><box-header><label text="Job Run Info" type="h5"/></box-header><box-toolbar>
+            <container-box><box-header title="Job Run Info"/><box-toolbar>
                 <link url="runJob" text="Run Job" confirmation="Run job now with current parameters?"/>
                 <link url="jobRunList" text="Job Runs" parameter-map="[jobName:jobName, startTime_poffset:'0', startTime_period:'Month']"/>
             </box-toolbar><box-body>
@@ -72,13 +72,15 @@ along with this software (see the LICENSE.md file). If not, see
                 </fail-widgets></section>
             </box-body></container-box>
 
-            <container-box><box-header><label text="Job Settings" type="h5"/></box-header><box-body>
+            <container-box><box-header title="Job Settings"/><box-body>
                 <form-single name="ServiceJobForm" map="serviceJob" transition="updateJob">
                     <field name="jobName"><default-field><display/></default-field></field>
                     <auto-fields-entity entity-name="moqui.service.job.ServiceJob" field-type="edit" include="nonpk"/>
                     <field name="description"><default-field><text-line size="60"/></default-field></field>
                     <field name="serviceName"><default-field><text-line size="60"/></default-field></field>
-                    <field name="expireLockTime"><default-field title="Expire Lock Minutes" tooltip="Defaults to 1440 (24 hours)">
+                    <field name="expireLockTime"><default-field title="Expire Lock Minutes" tooltip="After this time job run locks are ignored, defaults to 1440 minutes (24 hours)">
+                        <text-line size="4"/></default-field></field>
+                    <field name="minRetryTime"><default-field title="Min Retry Minutes" tooltip="Min time to retry after error, defaults to 5 minutes">
                         <text-line size="4"/></default-field></field>
                     <field name="submitButton"><default-field title="Update Job"><submit/></default-field></field>
                     <field-layout>
@@ -88,7 +90,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </form-single>
             </box-body></container-box>
         </row-col><row-col md="6">
-            <container-box><box-header><label text="Parameters" type="h5"/></box-header><box-toolbar>
+            <container-box><box-header title="Parameters"/><box-toolbar>
                 <container-dialog id="AddParameterDialog" button-text="Add Parameter">
                     <form-single name="CreateJobParameter" transition="createJobParameter">
                         <field name="jobName"><default-field><hidden/></default-field></field>
@@ -109,7 +111,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </form-list>
             </box-body></container-box>
 
-            <container-box><box-header><label text="Users" type="h5"/></box-header><box-toolbar>
+            <container-box><box-header title="Users"/><box-toolbar>
                 <container-dialog id="AddUserDialog" button-text="Add User">
                     <form-single name="CreateJobUser" transition="createJobUser">
                         <field name="jobName"><default-field><hidden/></default-field></field>