Skip to content

Commit

Permalink
Merge pull request moqui#3 from moqui/master
Browse files Browse the repository at this point in the history
Synchronising my fork's master with moqui:master
  • Loading branch information
mrovnanik committed Aug 11, 2016
2 parents 62c9ab0 + 73dcc28 commit 5c0dc87
Show file tree
Hide file tree
Showing 36 changed files with 1,035 additions and 401 deletions.
3 changes: 2 additions & 1 deletion base-component/tools/screen/System/ArtifactHitBins.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ along with this software (see the LICENSE.md file). If not, see
<header-field title="Slow Hits" show-order-by="true"/>
<default-field><display/></default-field>
</field>
<field name="find"><header-field title="Find"><submit/></header-field></field>
<field name="find"><header-field title="Find"><submit/></header-field>
<default-field><display text=" "/></default-field></field>

<form-list-column><field-ref name="artifactType"/><field-ref name="artifactSubType"/></form-list-column>
<form-list-column><field-ref name="artifactName"/><field-ref name="binStartDateTime"/></form-list-column>
Expand Down
9 changes: 4 additions & 5 deletions base-component/tools/screen/System/ArtifactHitSummary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,11 @@ along with this software (see the LICENSE.md file). If not, see
<option key="script"/><option key="java"/>
</drop-down>
</header-field>
<!-- NOTE: was using this to add space to avoid wide cells: ?.replace('/',' / ') -->
<default-field><display text="${artifactSubType}"/></default-field>
<default-field><display/></default-field>
</field>
<field name="artifactName">
<header-field show-order-by="true"><text-find hide-options="true" size="20"/></header-field>
<!-- NOTE: these replace() calls are to add spaces so that longer artifactNames can wrap instead of making the table super-wide: .replace('/',' / ').replace(' / / ', '//').replace('.',' . ') -->
<default-field><display text="${artifactName}"/></default-field>
<default-field><display/></default-field>
</field>
<field name="lastHitDateTime">
<header-field title="Last Hit" show-order-by="true"/>
Expand Down Expand Up @@ -99,7 +97,8 @@ along with this software (see the LICENSE.md file). If not, see
<header-field title="Slow Hits" show-order-by="true"/>
<default-field><display/></default-field>
</field>
<field name="find"><header-field title="Find"><submit/></header-field></field>
<field name="find"><header-field title="Find"><submit/></header-field><default-field>
<display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
3 changes: 2 additions & 1 deletion base-component/tools/screen/System/AuditLog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ along with this software (see the LICENSE.md file). If not, see
<header-field title="Visit" show-order-by="true"><text-find hide-options="true" size="6"/></header-field>
<default-field><display also-hidden="false"/></default-field>
</field>
<field name="find"><header-field title="Find"><submit/></header-field></field>
<field name="find"><header-field title="Find"><submit/></header-field>
<default-field><display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ along with this software (see the LICENSE.md file). If not, see
<default-field><display/></default-field>
</field>

<field name="find">
<header-field title="Find"><submit/></header-field>
</field>
<field name="find"><header-field title="Find"><submit/></header-field>
<default-field><display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
44 changes: 44 additions & 0 deletions base-component/tools/screen/System/Security/ActiveUsers.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This software is in the public domain under CC0 1.0 Universal plus a
Grant of Patent License.
To the extent possible under law, the author(s) have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty.
You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Active Users" default-menu-index="5">

<transition name="userAccountDetail"><default-response url="//system/Security/UserAccountDetail"/></transition>

<actions>
<entity-find entity-name="moqui.server.VisitUserSummary" list="visitUserList">
<search-form-inputs default-order-by="-visitCount"><default-parameters
fromDate_poffset="0" fromDate_period="Month"/></search-form-inputs>
<select-field field-name="userId,visitCount,fromDateMin,fromDateMax"/>
</entity-find>
</actions>
<widgets>
<form-list name="VisitUserList" list="visitUserList" skip-form="true">
<field name="fromDate">
<header-field show-order-by="true"><date-period allow-empty="true"/></header-field>
<default-field><display text="Min: ${ec.l10n.format(fromDateMin, '')} Max: ${ec.l10n.format(fromDateMax, '')}"/></default-field>
</field>
<field name="userId">
<header-field show-order-by="true"><text-find hide-options="true" size="6"/></header-field>
<default-field><display/><link url="userAccountDetail" text="UsernameTemplate" link-type="anchor"
entity-name="moqui.security.UserAccount"/></default-field>
</field>
<field name="visitCount"><header-field show-order-by="true"><range-find size="4"/></header-field>
<default-field><display/></default-field></field>
<field name="find"><header-field><submit text="Find"/></header-field>
<default-field><display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ along with this software (see the LICENSE.md file). If not, see
<header-field show-order-by="true"><text-find size="20" hide-options="true"/></header-field>
<default-field><display/></default-field>
</field>
<field name="find">
<header-field title="Find"><submit/></header-field>
</field>
<field name="find"><header-field title="Find"><submit/></header-field>
<default-field><display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ along with this software (see the LICENSE.md file). If not, see
<header-field show-order-by="true"><text-find size="8" hide-options="true"/></header-field>
<default-field><display/></default-field>
</field>
<field name="find">
<header-field title="Find"><submit/></header-field>
</field>
<field name="find"><header-field title="Find"><submit/></header-field>
<default-field><display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ along with this software (see the LICENSE.md file). If not, see
<form-list name="UserGroupList" list="ugmList" transition="updateUserGroupMember">
<field name="userGroupId"><default-field><hidden/></default-field></field>
<field name="userId">
<header-field show-order-by="true"/>
<default-field title="User Account">
<header-field title="User Account" show-order-by="true"/>
<default-field>
<display-entity entity-name="moqui.security.UserAccount" text="${username} - ${userFullName}"/>
<link url="userAccountDetail" text="${userId}" link-type="anchor"/>
</default-field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ along with this software (see the LICENSE.md file). If not, see
<header-field show-order-by="true"><text-find size="20" hide-options="true"/></header-field>
<default-field><display/></default-field>
</field>
<field name="find">
<header-field title="Find"><submit/></header-field>
</field>
<field name="find"><header-field title="Find"><submit/></header-field>
<default-field><display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
21 changes: 21 additions & 0 deletions base-component/tools/screen/System/ServiceJob.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This software is in the public domain under CC0 1.0 Universal plus a
Grant of Patent License.
To the extent possible under law, the author(s) have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty.
You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Service Jobs" default-menu-index="12">
<subscreens default-item="Jobs"/>
<widgets>
<subscreens-panel id="ServiceJobPanel" type="popup"/>
</widgets>
</screen>
22 changes: 22 additions & 0 deletions base-component/tools/screen/System/ServiceJob/JobRuns.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This software is in the public domain under CC0 1.0 Universal plus a
Grant of Patent License.
To the extent possible under law, the author(s) have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty.
You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Job Runs" default-menu-index="2">

<subscreens default-item="JobRunList"/>
<widgets>
<subscreens-panel id="JobRunsPanel" type="tab"/>
</widgets>
</screen>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This software is in the public domain under CC0 1.0 Universal plus a
Grant of Patent License.
To the extent possible under law, the author(s) have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty.
You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Job Run Detail" default-menu-index="1">

<parameter name="jobRunId" required="true"/>
<transition name="serviceJobDetail"><default-response url="../../Jobs/ServiceJobDetail"/></transition>
<transition name="userAccountDetail"><default-response url="../../../Security/UserAccount/UserAccountDetail"/></transition>

<actions>
<entity-find-one entity-name="moqui.service.job.ServiceJobRun" value-field="serviceJobRun"/>
</actions>
<widgets>
<form-single name="ServiceJobRunDetail" map="serviceJobRun">
<auto-fields-entity entity-name="moqui.service.job.ServiceJobRun" field-type="display"/>
<field name="jobName"><default-field><link url="serviceJobDetail" text="${jobName}" link-type="anchor"/></default-field></field>
<field name="userId"><default-field title="User">
<display-entity entity-name="moqui.security.UserAccount" text="${username} - ${userFullName}"/>
<link url="userAccountDetail" text="${userId}" link-type="anchor" condition="userId"/>
</default-field></field>

<field-layout>
<field-ref name="jobRunId"/><field-ref name="jobName"/><field-ref name="userId"/>
<fields-not-referenced/>
</field-layout>
</form-single>
</widgets>
</screen>
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This software is in the public domain under CC0 1.0 Universal plus a
Grant of Patent License.
To the extent possible under law, the author(s) have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty.
You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-include="false">

<transition name="jobRunDetail"><default-response url="../JobRunDetail"/></transition>
<transition name="serviceJobDetail"><default-response url="../../Jobs/ServiceJobDetail"/></transition>
<transition name="userAccountDetail"><default-response url="../../../Security/UserAccount/UserAccountDetail"/></transition>

<actions>
<entity-find entity-name="moqui.service.job.ServiceJobRun" list="jobRunList">
<search-form-inputs default-order-by="startTime">
<default-parameters startTime_poffset="0" startTime_period="Week"/></search-form-inputs>
</entity-find>
</actions>
<widgets>
<form-list name="JobRunList" list="jobRunList" skip-form="true">
<field name="jobRunId"><header-field show-order-by="true"><text-find size="10" hide-options="true"/></header-field>
<default-field><link url="jobRunDetail" text="${jobRunId}" link-type="anchor"/></default-field></field>
<field name="jobName">
<header-field show-order-by="case-insensitive">
<drop-down allow-empty="true">
<entity-options key="${jobName}" text="${jobName}">
<entity-find entity-name="moqui.service.job.ServiceJob" limit="200">
<order-by field-name="jobName"/></entity-find>
</entity-options>
</drop-down>
</header-field>
<default-field><link url="serviceJobDetail" text="${jobName}" link-type="anchor"/></default-field>
</field>
<field name="userId"><header-field title="User"><text-find size="10" hide-options="true"/></header-field><default-field>
<display-entity entity-name="moqui.security.UserAccount" text="${username} - ${userFullName}"/>
<link url="userAccountDetail" text="${userId}" link-type="anchor" condition="userId"/>
</default-field></field>

<field name="hasError"><header-field><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></header-field>
<default-field><display/></default-field></field>
<field name="startTime"><header-field><date-period allow-empty="true"/></header-field>
<default-field><display/></default-field></field>
<field name="endTime"><header-field><date-period allow-empty="true"/></header-field>
<default-field><display/></default-field></field>

<field name="findButton"><header-field title="Find"><submit/></header-field><default-field>
<display text=" "/></default-field></field>
</form-list>
</widgets>
</screen>
22 changes: 22 additions & 0 deletions base-component/tools/screen/System/ServiceJob/Jobs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This software is in the public domain under CC0 1.0 Universal plus a
Grant of Patent License.
To the extent possible under law, the author(s) have dedicated all
copyright and related and neighboring rights to this software to the
public domain worldwide. This software is distributed without any
warranty.
You should have received a copy of the CC0 Public Domain Dedication
along with this software (see the LICENSE.md file). If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.0.xsd"
default-menu-title="Jobs" default-menu-index="1">

<subscreens default-item="ServiceJobList"/>
<widgets>
<subscreens-panel id="JobsPanel" type="tab"/>
</widgets>
</screen>
Loading

0 comments on commit 5c0dc87

Please sign in to comment.