Changeset 1626

Timestamp:

02/22/10 13:36:04 (5 months ago)

Author:

klemens

Message:

ullFlow: index: workflows are now ordered alphabetically

Location:

trunk/plugins

Files:

• ullCorePlugin/modules/default/lib/BaseUllSidebarComponents.class.php (modified) (1 diff)
• ullCorePlugin/modules/default/templates/_sidebar.php (modified) (1 diff)
• ullFlowPlugin/lib/model/doctrine/PluginUllFlowAppTable.class.php (modified) (1 diff)
• ullFlowPlugin/modules/ullFlow/lib/BaseUllFlowActions.class.php (modified) (1 diff)

trunk/plugins/ullCorePlugin/modules/default/lib/BaseUllSidebarComponents.class.php

@@ -4 +4 @@
 {
   public function executeSidebar(sfRequest $request) {
-    $this->flowApps = Doctrine::getTable('UllFlowApp')->findAll();
+    $this->flow_apps = UllFlowAppTable::findAllOrderByName();
 
     if ($request->getParameter('module') == 'ullPhone')

trunk/plugins/ullCorePlugin/modules/default/templates/_sidebar.php

@@ -37 +37 @@
     <h3><?php echo __('Create', null, 'common') ?></h3>
     <ul class="sidebar_list">
-    <?php foreach ($flowApps as $app): ?>
+    <?php foreach ($flow_apps as $app): ?>
       <li><?php echo ull_link_to($app->doc_label, 'ullFlow/create?app=' . $app->slug, 'ull_js_observer_confirm=true') ?></li>
     <?php endforeach ?>

trunk/plugins/ullFlowPlugin/lib/model/doctrine/PluginUllFlowAppTable.class.php

@@ -45 +45 @@
     return $q->execute()->getFirst();
   }
+  
+  
+  /**
+   * Find all apps ordered by name
+   * 
+   * @return Doctrine_Collection
+   */
+  public static function findAllOrderByName() 
+  {
+    $q = new UllQuery('UllFlowApp');
+    $q
+      ->addSelect('Translation->label')
+      ->addSelect('Translation->doc_label')
+      ->addSelect('slug')
+      ->addOrderBy('Translation->label')
+      ->addWhere('Translation->lang = ?', 
+        substr(sfContext::getInstance()->getUser()->getCulture(), 0, 2))
+    ;
+      
+    $result = $q->execute();
+
+    return $result;
+  }
 
 }

trunk/plugins/ullFlowPlugin/modules/ullFlow/lib/BaseUllFlowActions.class.php

@@ -46 +46 @@
     else
     {
-      $this->apps = Doctrine::getTable('UllFlowApp')->findAll();
+      $this->apps = UllFlowAppTable::findAllOrderByName();
     }