dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09889
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2681: Minor GUI bug
------------------------------------------------------------
revno: 2681
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-01-20 23:08:42 +0100
message:
Minor GUI bug
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PaginatedList.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PaginatedListTest.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/deleteCurrentUser.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PaginatedList.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PaginatedList.java 2011-01-20 21:14:33 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PaginatedList.java 2011-01-20 22:08:42 +0000
@@ -81,7 +81,7 @@
/**
* Returns the number of pages in the list.
*/
- public int pageSize()
+ public int pageCount()
{
int c = size();
int r = c / pageSize;
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PaginatedListTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PaginatedListTest.java 2011-01-20 21:14:33 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PaginatedListTest.java 2011-01-20 22:08:42 +0000
@@ -74,19 +74,19 @@
}
@Test
- public void testPageSize()
+ public void testPageCount()
{
PaginatedList<String> list = new PaginatedList<String>( Arrays.asList( "A", "B", "C" ), 2 );
- assertEquals( 2, list.pageSize() );
+ assertEquals( 2, list.pageCount() );
list = new PaginatedList<String>( Arrays.asList( "A", "B", "C", "D" ), 2 );
- assertEquals( 2, list.pageSize() );
+ assertEquals( 2, list.pageCount() );
list = new PaginatedList<String>( Arrays.asList( "A", "B", "C", "D", "E" ), 2 );
- assertEquals( 3, list.pageSize() );
+ assertEquals( 3, list.pageCount() );
}
@Test
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2010-12-09 03:19:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2011-01-20 22:08:42 +0000
@@ -83,8 +83,6 @@
</table>
</form>
-<span id="message"></span>
-
<script type="text/javascript">
var i18n_adding_role_failed = '$encoder.jsEscape( $i18n.getString( "adding_role_failed" ) , "'")';
sortList('availableListAuthority','ASC');
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm 2010-12-09 22:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm 2011-01-20 22:08:42 +0000
@@ -1,4 +1,3 @@
-<span id="message" style="top:70px;right:5px;position:fixed;width:200px;z-index:100009" onclick="hideById(this.id);"></span>
<h3>$i18n.getString( "user_role_management" ) #openHelp( "user_roles" )</h3>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/deleteCurrentUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/deleteCurrentUser.vm 2010-09-25 20:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/deleteCurrentUser.vm 2011-01-20 22:08:42 +0000
@@ -15,15 +15,9 @@
<td><label for="oldPassword">$i18n.getString( "password" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td><input type="password" id="oldPassword" name="oldPassword" style="width:20em"/></td>
</tr>
-
- <tr>
- <td colspan="4" height="10">
- <span id="message"></span>
- </td>
- </tr>
<tr>
<td></td>
- <td valign="top"><input type="submit" value="$i18n.getString( 'Delete' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='deleteCurrentUser.action'" style="width:10em"/></td>
+ <td valign="top"><input type="submit" value="$i18n.getString( 'Delete' )" style="width:10em"/><input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='index.action'" style="width:10em"/></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2010-12-09 03:19:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2011-01-20 22:08:42 +0000
@@ -97,4 +97,3 @@
sortList('availableListAuthority','ASC');
sortList('selectedListAuthority','ASC');
</script>
-<span id="message"></span>
