Author: david
Date: Tue Aug 30 16:13:05 2011
New Revision: 9639
Log:
Set $quotaType variable for checking correct radio button
Modified:
trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
trunk/apps/qubit/modules/repository/templates/_uploadLimit.php
Modified:
trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
Tue Aug 30 16:00:45 2011 (r9638)
+++ trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
Tue Aug 30 16:13:05 2011 (r9639)
@@ -21,6 +21,21 @@
{
public function execute($request)
{
+ // Get upload type
+ switch ($this->resource->uploadLimit)
+ {
+ case -1:
+ $this->quotaType = 'unlimited';
+ break;
+
+ case 0:
+ $this->quotaType = 'disabled';
+ break;
+
+ default:
+ $this->quotaType = 'limited';
+ }
+
// Usage bar defaults
$this->usageBarPixels = 0;
$this->usageBarColors = array(
@@ -63,7 +78,7 @@
$this->usageBarColor = $this->usageBarColors['default'];
// Calc progress bar and percentages values for usage limit > 0
- if (0 < $this->resource->uploadLimit)
+ if ('limited' == $this->quotaType)
{
// Calc percent
$dup = $this->diskUsage / floatval($this->resource->uploadLimit) * 100;
Modified: trunk/apps/qubit/modules/repository/templates/_uploadLimit.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/_uploadLimit.php Tue Aug
30 16:00:45 2011 (r9638)
+++ trunk/apps/qubit/modules/repository/templates/_uploadLimit.php Tue Aug
30 16:13:05 2011 (r9639)
@@ -5,16 +5,16 @@
<div>
-<?php if (0 < floatval($resource->uploadLimit)): ?>
+<?php if ('limited' == $quotaType): ?>
<div class="usageBar">
<div style="height: 10px; width: <?php echo $usageBarPixels ?>px;
background-color: <?php echo $usageBarColor ?>;"></div>
</div>
<?php echo __('%du% of %limit% <abbr title="1 GB = 1 000 000 000
bytes">GB</abbr> (%percent%%)', array('%du%' => $diskUsage, '%limit%' =>
$uploadLimit, '%percent%' => $diskUsagePercent)) ?>
-<?php elseif (0 == $resource->uploadLimit): ?>
+<?php elseif ('disabled' == $quotaType): ?>
<?php echo __('Upload is disabled') ?>
-<?php else: ?>
+<?php elseif ('unlimited' == $quotaType): ?>
<?php echo __('%du% <abbr title="1 GB = 1 000 000 000 bytes">GB</abbr> of
<em>Unlimited</em>', array('%du%' => $diskUsage)) ?>
-<?php endif; // Limited, disabled, unlimited disk usage ?>
+<?php endif; ?>
<?php if ($sf_user->hasCredential('administrator')): ?>
<?php echo __('( %1%edit%2% )', array('%1%' => '<a href="#"
id="editUlLink">', '%2%' => '</a>')) ?>
@@ -24,8 +24,9 @@
</div>
<?php if ($sf_user->hasCredential('administrator') && !$noedit): ?>
+
<!-- Edit upload limit -->
-<!-- NOTE YUI dialog wraps this *entire* div -->
+<!-- Note: YUI dialog hides this entire div -->
<div class="section" id="editUploadLimit">
<div class="hd"><?php echo __('Edit upload quota') ?></div>
@@ -38,15 +39,15 @@
<ul class="radio_list">
<li class="radio">
- <input id="uploadLimit_type_disabled" type="radio"
name="uploadLimit[type]" value="disabled" />
+ <input id="uploadLimit_type_disabled" type="radio"
name="uploadLimit[type]" value="disabled"<?php echo ('disabled' == $quotaType)
? ' checked' : '' ?> />
<label class="radio" for="uploadLimit_type_disabled"><?php echo
__('Disable uploads') ?></label>
</li>
<li class="radio">
- <input id="uploadLimit_type_limited" type="radio"
name="uploadLimit[type]" value="limited" />
+ <input id="uploadLimit_type_limited" type="radio"
name="uploadLimit[type]" value="limited"<?php echo ('limited' == $quotaType) ?
' checked' : '' ?> />
<label for="uploadLimit_type_limited"><?php echo __('Limit uploads
to %1% GB', array('%1%' => '<input id="uploadLimit_value" type="text"
name="uploadLimit[value]" style="width: 6em" />')) ?></label>
</li>
<li class="radio">
- <input id="uploadLimit_type_unlimited" type="radio"
name="uploadLimit[type]" value="unlimited" />
+ <input id="uploadLimit_type_unlimited" type="radio"
name="uploadLimit[type]" value="unlimited"<?php echo ('unlimited' ==
$quotaType) ? ' checked' : '' ?> />
<label for="uploadLimit_type_unlimited"><?php echo __('Allow
unlimited uploads', array('%1%' => sfConfig::get('app_ui_label_repository')))
?></label>
</li>
</fieldset>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
