Skip to content

Commit

Permalink
MGR-138 Yet more format differences to adjust.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dheuvels
dheuvels committed Jul 25, 2022
1 parent 88ed1c7 commit b7a4882
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
34 changes: 17 additions & 17 deletions src/test/resources/xml/SitesTest-testShowSites.xml
View file
Expand Up @@ -6,28 +6,28 @@
<permission ref="site.list" mode="set"></permission>
</permissions>
<params>
<param name="name" />
<param name="domain" />
<param name="active" />
<param name="name"/>
<param name="domain"/>
<param name="active"/>
</params>
<meta-data bindClass="org.appng.api.model.Site">
<field name="name" type="text" binding="name">
<sort />
<sort/>
<label id="name">Name</label>
</field>
<field name="host" type="text" binding="host">
<sort />
<sort/>
<label id="host">Hostname</label>
</field>
<field name="domain" type="text" binding="domain">
<sort />
<sort/>
<label id="domain">Domain</label>
</field>
<field name="description" type="text" binding="description">
<label id="description">Description</label>
</field>
<field name="active" type="image" binding="active">
<sort />
<sort/>
<label id="active">Active</label>
<icon condition="${current.active}">led_green</icon>
<icon condition="${!current.active}">led_red</icon>
Expand Down Expand Up @@ -55,15 +55,15 @@
</linkpanel>
<linkpanel id="actions" location="inline">
<link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=${current.id}">
<condition expression="${current.active and current.state.name() eq 'STOPPED'}" />
<condition expression="${current.active and current.state.name() eq 'STOPPED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
<label id="site.start">Start</label>
<icon>activate</icon>
</link>
<link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=${current.id}">
<condition expression="${current.state.name() eq 'STARTED'}" />
<condition expression="${current.state.name() eq 'STARTED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
Expand All @@ -79,7 +79,7 @@
<icon>edit</icon>
</link>
<link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=${current.id}">
<condition expression="${current.state.name() eq 'STOPPED'}" />
<condition expression="${current.state.name() eq 'STOPPED'}"/>
<permissions>
<permission ref="site.delete" mode="set"></permission>
</permissions>
Expand All @@ -88,7 +88,7 @@
<confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "#{name}"?</confirmation>
</link>
<link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=${current.id}" show-disabled="true">
<condition expression="${current.state.name() eq 'STARTED'}" />
<condition expression="${current.state.name() eq 'STARTED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
Expand All @@ -97,7 +97,7 @@
<confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
</link>
<link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=${current.id}">
<condition expression="${current.state.name() eq 'STARTED'}" />
<condition expression="${current.state.name() eq 'STARTED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
Expand All @@ -110,17 +110,17 @@
<selectionGroup>
<selection id="f_sn" type="text">
<title id="name">Name</title>
<option value="" name="f_sn" />
<option value="" name="f_sn"/>
</selection>
<selection id="f_sd" type="text">
<title id="domain">Domain</title>
<option value="" name="f_sd" />
<option value="" name="f_sd"/>
</selection>
<selection id="f_sa" type="radio">
<title id="active">Active</title>
<option value="all" name="all" selected="true" />
<option value="true" name="yes" selected="false" />
<option value="false" name="no" selected="false" />
<option value="all" name="all" selected="true"/>
<option value="true" name="yes" selected="false"/>
<option value="false" name="no" selected="false"/>
</selection>
</selectionGroup>
<resultset chunk="0" chunkname="sites" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="2">
Expand Down
22 changes: 11 additions & 11 deletions src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
View file
Expand Up @@ -12,22 +12,22 @@
</params>
<meta-data bindClass="org.appng.api.model.Site">
<field name="name" type="text" binding="name">
<sort />
<sort/>
<label id="name">Name</label>
</field>
<field name="host" type="text" binding="host">
<sort />
<sort/>
<label id="host">Hostname</label>
</field>
<field name="domain" type="text" binding="domain">
<sort />
<sort/>
<label id="domain">Domain</label>
</field>
<field name="description" type="text" binding="description">
<label id="description">Description</label>
</field>
<field name="active" type="image" binding="active">
<sort />
<sort/>
<label id="active">Active</label>
<icon condition="${current.active}">led_green</icon>
<icon condition="${!current.active}">led_red</icon>
Expand Down Expand Up @@ -55,15 +55,15 @@
</linkpanel>
<linkpanel id="actions" location="inline">
<link id="actions[1]" mode="intern" target="/sites?act=start&amp;siteid=${current.id}">
<condition expression="${current.active and current.state.name() eq 'STOPPED'}" />
<condition expression="${current.active and current.state.name() eq 'STOPPED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
<label id="site.start">Start</label>
<icon>activate</icon>
</link>
<link id="actions[2]" mode="intern" target="/sites?act=stop&amp;siteid=${current.id}">
<condition expression="${current.state.name() eq 'STARTED'}" />
<condition expression="${current.state.name() eq 'STARTED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
Expand All @@ -79,7 +79,7 @@
<icon>edit</icon>
</link>
<link id="actions[4]" mode="intern" target="/sites?act=delete&amp;siteid=${current.id}">
<condition expression="${current.state.name() eq 'STOPPED'}" />
<condition expression="${current.state.name() eq 'STOPPED'}"/>
<permissions>
<permission ref="site.delete" mode="set"></permission>
</permissions>
Expand All @@ -88,7 +88,7 @@
<confirmation id="site.delete.confirm" params="#{name}">Do you really want to delete the site "#{name}"?</confirmation>
</link>
<link id="actions[5]" mode="intern" target="/sites?act=reload&amp;siteid=${current.id}" show-disabled="true">
<condition expression="${current.state.name() eq 'STARTED'}" />
<condition expression="${current.state.name() eq 'STARTED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
Expand All @@ -97,7 +97,7 @@
<confirmation id="site.reload.confirm" params="#{name}">Reload site #{name}?</confirmation>
</link>
<link id="actions[6]" mode="intern" target="/sites?act=reloadTemplate&amp;siteid=${current.id}">
<condition expression="${current.state.name() eq 'STARTED'}" />
<condition expression="${current.state.name() eq 'STARTED'}"/>
<permissions>
<permission ref="site.reload" mode="set"></permission>
</permissions>
Expand All @@ -110,11 +110,11 @@
<selectionGroup>
<selection id="f_sn" type="text">
<title id="name">Name</title>
<option value="site" name="f_sn" />
<option value="site" name="f_sn"/>
</selection>
<selection id="f_sd" type="text">
<title id="domain">Domain</title>
<option value="example" name="f_sd" />
<option value="example" name="f_sd"/>
</selection>
<selection id="f_sa" type="radio">
<title id="active">Active</title>
Expand Down

0 comments on commit b7a4882

Please sign in to comment.