Author: david
Date: Fri Aug 26 17:13:59 2011
New Revision: 9617
Log:
Cosmetic change. Put disk usage/quota code before holdings search
Modified:
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Modified:
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Fri Aug 26 17:12:01 2011 (r9616)
+++ trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Fri Aug 26 17:13:59 2011 (r9617)
@@ -32,17 +32,6 @@
return sfView::NONE;
}
- $criteria = new Criteria;
- $criteria->addJoin(QubitInformationObject::ID, QubitObject::ID);
- $criteria->add(QubitInformationObject::REPOSITORY_ID, $this->resource->id);
- $criteria->addAscendingOrderByColumn('title');
-
- // Sort holdings alphabetically (w/ fallback)
- $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitInformationObject');
-
- // Filter draft descriptions
- $criteria = QubitAcl::addFilterDraftsCriteria($criteria);
-
// Show current disk usage vs. limit for repository, unless upload is
// disabled (zero)
if (0 != $this->resource->uploadLimit)
@@ -97,6 +86,17 @@
}
}
+ $criteria = new Criteria;
+ $criteria->addJoin(QubitInformationObject::ID, QubitObject::ID);
+ $criteria->add(QubitInformationObject::REPOSITORY_ID, $this->resource->id);
+ $criteria->addAscendingOrderByColumn('title');
+
+ // Sort holdings alphabetically (w/ fallback)
+ $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitInformationObject');
+
+ // Filter draft descriptions
+ $criteria = QubitAcl::addFilterDraftsCriteria($criteria);
+
// Paginate holdings list
$this->pager = new QubitPager('QubitInformationObject');
$this->pager->setCriteria($criteria);
--
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.
