Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13883: Merge branch 'Release02x01'
  • Loading branch information
gac410 committed May 16, 2017
2 parents 1bd73f5 + 438d0fc commit 4804978
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 25 deletions.
@@ -1,5 +1,5 @@
# See bottom of file for license and copyright information
package HTML;
package ERP_HTML;

use strict;
use warnings;
Expand Down Expand Up @@ -223,16 +223,21 @@ INPUT
# erp_table => "TABLE_0"
);
my $expected = <<EXPECTED;
<form method="POST" action="$saveurl" name="erp_form_TABLE_0">
<input type="hidden" name="erp_topic" value="$this->{test_web}.$this->{test_topic}" /><input type="hidden" name="erp_version" value="VERSION" /><input type="hidden" name="erp_table" value="TABLE_0" /><input type="hidden" name="erp_row" value="0" />
<form action='$saveurl' method='POST' name='erp_form_TABLE_0'>
<input name='erp_topic' type='hidden' value='$this->{test_web}.$this->{test_topic}'></input>
<input name='erp_version' type='hidden' value='VERSION'></input>
<input name='erp_table' type='hidden' value='TABLE_0'></input>
<input name='erp_row' type='hidden' value='0'></input>
<a name='erp_TABLE_0'></a>
<input type="hidden" name="erp_TABLE_0_format" value="" />
<input name='erp_TABLE_0_format' type='hidden' value=''></input>
| #REF0# |
<input type="hidden" name="erp_action" value="" />
<button type="submit" name="erp_action" value="saveTableCmd" title="Save" class="ui-icon ui-icon-disk erp-button" />
<button type="submit" name="erp_action" value="cancelCmd" title="Cancel" class="ui-icon ui-icon-cancel erp-button" />
<button class="ui-icon ui-icon-plusthick erp-button" name="erp_action" title="Add new row after this row / at the end" type="submit" value="addRowCmd" />
<button class="ui-icon ui-icon-minusthick erp-button" name="erp_action" title="Delete this row / last row" type="submit" value="deleteRowCmd" />
<input name='erp_action' type='hidden' value=''></input>
<button class='ui-icon ui-icon-disk erp-button' name='erp_action' title='Save' type='submit' value='saveRowCmd'></button>
<button class='ui-icon ui-icon-cancel erp-button' name='erp_action' title='Cancel' type='submit' value='cancelCmd'></button>
<button class='ui-icon ui-icon-plusthick erp-button' name='erp_action' title='Add new row after this row / at the end' type='submit' value='addRowCmd'></button>
<button class='ui-icon ui-icon-minusthick erp-button' name='erp_action' title='Delete this row / last row' type='submit' value='deleteRowCmd'></button>
<a name='erp_TABLE_0_0'></a>|
</form>
EXPECTED
$this->assert_html_equals( $expected, $in );
Expand Down Expand Up @@ -285,18 +290,21 @@ INPUT
);
Foswiki::Plugins::EditRowPlugin::postRenderingHandler($in);
my $expected = <<EXPECTED;
<form method="POST" action="$saveurl" name="erp_form_TABLE_0">
<input type="hidden" name="erp_topic" value="$this->{test_web}.$this->{test_topic}" /><input type="hidden" name="erp_version" value="VERSION" /><input type="hidden" name="erp_table" value="TABLE_0" /><input type="hidden" name="erp_row" value="0" />
<form action='$saveurl' method='POST' name='erp_form_TABLE_0'>
<input name='erp_topic' type='hidden' value='$this->{test_web}.$this->{test_topic}'></input>
<input name='erp_version' type='hidden' value='VERSION'></input>
<input name='erp_table' type='hidden' value='TABLE_0'></input>
<input name='erp_row' type='hidden' value='0'></input>
<a name='erp_TABLE_0'></a>
<input type="hidden" name="erp_TABLE_0_format" value="" />
<input name='erp_TABLE_0_format' type='hidden' value=''></input>
| #REF0# |
<input type="hidden" name="erp_action" value="" />
<button class="ui-icon ui-icon-disk erp-button" name="erp_action" title="Save" type="submit" value="saveTableCmd"/>
<button class="ui-icon ui-icon-cancel erp-button" name="erp_action" title="Cancel" type="submit" value="cancelCmd"/>
<button class="ui-icon ui-icon-plusthick erp-button" name="erp_action" title="Add new row after this row / at the end" type="submit" value="addRowCmd">
</button>
<button class="ui-icon ui-icon-minusthick erp-button" name="erp_action" title="Delete this row / last row" type="submit" value="deleteRowCmd">
</button>
<input name='erp_action' type='hidden' value=''></input>
<button class='ui-icon ui-icon-disk erp-button' name='erp_action' title='Save' type='submit' value='saveRowCmd'></button>
<button class='ui-icon ui-icon-cancel erp-button' name='erp_action' title='Cancel' type='submit' value='cancelCmd'></button>
<button class='ui-icon ui-icon-plusthick erp-button' name='erp_action' title='Add new row after this row / at the end' type='submit' value='addRowCmd'></button>
<button class='ui-icon ui-icon-minusthick erp-button' name='erp_action' title='Delete this row / last row' type='submit' value='deleteRowCmd'></button>
<a name='erp_TABLE_0_0'></a>|
</form>
EXPECTED
$this->assert_html_equals( $expected, $in );
Expand Down
Expand Up @@ -6,6 +6,6 @@ use warnings;
use Unit::TestSuite;
our @ISA = 'Unit::TestSuite';

sub include_tests { return ( 'Parser', 'HTML', 'Rest' ) }
sub include_tests { return ( 'Parser', 'ERP_HTML', 'Rest' ) }

1;
6 changes: 3 additions & 3 deletions core/data/System/ReleaseHistory.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1494553358" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1494895208" format="1.1" version="1"}%
%META:TOPICPARENT{name="AdminDocumentationCategory"}%
History of Foswiki
%STARTINCLUDE%
Expand All @@ -7,9 +7,9 @@ History of Foswiki
---+ Appendix A: Foswiki Development Time-line

%TOC%
---++ Foswiki Release 2.1.4-RC2 - 13 May 2017
---++ Foswiki Release 2.1.4-RC2 - 15 May 2017

Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 24 fixes.
Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 25 fixes.

---++ Foswiki Release 2.1.4-RC1 - 4 May 2017

Expand Down
4 changes: 2 additions & 2 deletions core/data/System/ReleaseNotes02x01.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1494884408" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1494895208" format="1.1" version="1"}%
%META:TOPICPARENT{name="ReleaseHistory"}%
---+!! Foswiki Release 2.1.4-RC2

Expand Down Expand Up @@ -55,7 +55,7 @@ Foswiki is released under the GNU General Public License.
* Foswiki 2.1.1 was built on 30 Apr 2016. It is a release that contains 36 fixes and 21 enhancements.
* Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix.
* Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
* Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 24 fixes.
* Foswiki 2.1.4-RC2 was built on 15 May 2017. It is a release that contains 25 fixes.


---++ Pre-installed Extensions
Expand Down

0 comments on commit 4804978

Please sign in to comment.