Author: david
Date: Tue Aug 30 13:54:17 2011
New Revision: 9631
Log:
Hide edit form and yui dialog code if returning uploadLimitComponent from
editUploadLimitSuccess
Modified:
trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
trunk/apps/qubit/modules/repository/templates/_uploadLimit.php
trunk/apps/qubit/modules/repository/templates/editUploadLimitSuccess.php
Modified:
trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
Tue Aug 30 13:44:16 2011 (r9630)
+++ trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
Tue Aug 30 13:54:17 2011 (r9631)
@@ -30,6 +30,12 @@
public function execute($request)
{
+ // Hide edit component for ajax response
+ if (!isset($this->noedit))
+ {
+ $this->noedit = false;
+ }
+
// Calc disk usage display value (in GB)
$this->diskUsage = $this->resource->getDiskUsage();
if (0 != $this->diskUsage)
Modified: trunk/apps/qubit/modules/repository/templates/_uploadLimit.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/_uploadLimit.php Tue Aug
30 13:44:16 2011 (r9630)
+++ trunk/apps/qubit/modules/repository/templates/_uploadLimit.php Tue Aug
30 13:54:17 2011 (r9631)
@@ -24,7 +24,7 @@
</div>
-<?php if ($sf_user->hasCredential('administrator')): ?>
+<?php if ($sf_user->hasCredential('administrator') && !$noedit): ?>
<!-- Edit upload limit -->
<!-- NOTE YUI dialog wraps this *entire* div -->
<div class="section" id="editUploadLimit">
Modified:
trunk/apps/qubit/modules/repository/templates/editUploadLimitSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/editUploadLimitSuccess.php
Tue Aug 30 13:44:16 2011 (r9630)
+++ trunk/apps/qubit/modules/repository/templates/editUploadLimitSuccess.php
Tue Aug 30 13:54:17 2011 (r9631)
@@ -1 +1 @@
-<?php include_component('repository', 'uploadLimit', array('resource' =>
$resource)) ?>
+<?php include_component('repository', 'uploadLimit', array('resource' =>
$resource, 'noedit' => true)) ?>
--
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.
