Changeset 3457
- Timestamp:
- Jun 7, 2007, 8:51:50 AM (16 years ago)
- Location:
- branches/2.3.1/www/admin/diskusage
- Files:
-
- 4 edited
-
details/view_details.jsp (modified) (4 diffs)
-
list_groups.jsp (modified) (6 diffs)
-
list_users.jsp (modified) (5 diffs)
-
overview.jsp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2.3.1/www/admin/diskusage/details/view_details.jsp
r3447 r3457 81 81 locations.add(String.valueOf(Location.PRIMARY.getValue()), Location.PRIMARY.toString()); 82 82 locations.add(String.valueOf(Location.SECONDARY.getValue()), Location.SECONDARY.toString()); 83 locations.add(String.valueOf(Location.OFFLINE.getValue()), Location.OFFLINE.toString()); 83 84 } 84 85 %> … … 270 271 <th style="text-align: right;"> Primary</th> 271 272 <th style="text-align: right;"> Secondary</th> 273 <th style="text-align: right;"> Offline</th> 272 274 </tr> 273 275 <tr> … … 279 281 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.PRIMARY))%></td> 280 282 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.SECONDARY))%></td> 283 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.OFFLINE))%></td> 281 284 </tr> 282 285 <tr> … … 292 295 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(qt, Location.PRIMARY))%></td> 293 296 <td style="text-align: right;"><%=qt.hasSecondaryLocation() ? Values.formatBytes(summary.getTotal(qt, Location.SECONDARY)) : "n/a"%></td> 297 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(qt, Location.OFFLINE))%></td> 294 298 </tr> 295 299 <% -
branches/2.3.1/www/admin/diskusage/list_groups.jsp
r3190 r3457 94 94 { 95 95 final ItemQuery<Group> query = Base.getConfiguredQuery(cc, true, Group.getQuery(), mode); 96 query.restrict( 97 Restrictions.neq( 98 Hql.property("quota"), null)); 96 99 groups = query.iterate(dc); 97 100 } … … 351 354 <td style="text-align: right;"> Primary</td> 352 355 <td style="text-align: right;"> Secondary</td> 356 <td style="text-align: right;"> Offline</td> 353 357 </tr> 354 358 <% … … 356 360 %> 357 361 <tr> 358 <td colspan=" 4" style="border-bottom: 1px dotted #999999"></td>362 <td colspan="5" style="border-bottom: 1px dotted #999999"></td> 359 363 </tr> 360 364 <tr style="background: #E0E0E0;"> … … 374 378 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.PRIMARY))%></td> 375 379 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.SECONDARY))%></td> 380 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.OFFLINE))%></td> 376 381 <% 377 382 } … … 379 384 </tr> 380 385 <tr> 381 <td colspan=" 4" style="border-top: 1px dotted #999999"></td>386 <td colspan="5" style="border-top: 1px dotted #999999"></td> 382 387 </tr> 383 388 <% … … 396 401 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(qt, Location.PRIMARY))%></td> 397 402 <td style="text-align: right;"><%=qt.hasSecondaryLocation() ? Values.formatBytes(summary.getTotal(qt, Location.SECONDARY)) : "n/a"%></td> 403 <td style="text-align: right;"><%=qt.getSystemId().equals(QuotaType.FILE) ? Values.formatBytes(summary.getTotal(qt, Location.OFFLINE)) : "n/a"%></td> 398 404 <% 399 405 } -
branches/2.3.1/www/admin/diskusage/list_users.jsp
r3190 r3457 488 488 <td style="text-align: right;"> Primary</td> 489 489 <td style="text-align: right;"> Secondary</td> 490 <td style="text-align: right;"> Offline</td> 490 491 </tr> 491 492 <% … … 493 494 %> 494 495 <tr> 495 <td colspan=" 4" style="border-bottom: 1px dotted #999999"></td>496 <td colspan="5" style="border-bottom: 1px dotted #999999"></td> 496 497 </tr> 497 498 <tr style="background: #E0E0E0;"> … … 511 512 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.PRIMARY))%></td> 512 513 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.SECONDARY))%></td> 514 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.OFFLINE))%></td> 513 515 <% 514 516 } … … 516 518 </tr> 517 519 <tr> 518 <td colspan=" 4" style="border-top: 1px dotted #999999"></td>520 <td colspan="5" style="border-top: 1px dotted #999999"></td> 519 521 </tr> 520 522 <% … … 533 535 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(qt, Location.PRIMARY))%></td> 534 536 <td style="text-align: right;"><%=qt.hasSecondaryLocation() ? Values.formatBytes(summary.getTotal(qt, Location.SECONDARY)) : "n/a"%></td> 537 <td style="text-align: right;"><%=qt.getSystemId().equals(QuotaType.FILE) ? Values.formatBytes(summary.getTotal(qt, Location.OFFLINE)) : "n/a"%></td> 535 538 <% 536 539 } -
branches/2.3.1/www/admin/diskusage/overview.jsp
r2978 r3457 107 107 <th style="text-align: right;"> Primary location</th> 108 108 <th style="text-align: right;"> Secondary location</th> 109 <th style="text-align: right;"> Moved offline</th> 109 110 </tr> 110 111 <tr> 111 <td colspan=" 4" style="border-bottom: 1px dotted #999999"></td>112 <td colspan="5" style="border-bottom: 1px dotted #999999"></td> 112 113 </tr> 113 114 <tr style="background: #E0E0E0;"> … … 116 117 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.PRIMARY))%></td> 117 118 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.SECONDARY))%></td> 119 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(Location.OFFLINE))%></td> 118 120 </tr> 119 121 <tr> 120 <td colspan=" 4" style="border-top: 1px dotted #999999"></td>122 <td colspan="5" style="border-top: 1px dotted #999999"></td> 121 123 </tr> 122 124 <% … … 129 131 <td style="text-align: right;"><%=Values.formatBytes(summary.getTotal(qt, Location.PRIMARY))%></td> 130 132 <td style="text-align: right;"><%=qt.hasSecondaryLocation() ? Values.formatBytes(summary.getTotal(qt, Location.SECONDARY)) : "n/a"%></td> 133 <td style="text-align: right;"><%=qt.getSystemId().equals(QuotaType.FILE) ? Values.formatBytes(summary.getTotal(qt, Location.OFFLINE)) : "n/a"%></td> 131 134 </tr> 132 135 <%
Note: See TracChangeset
for help on using the changeset viewer.
