Changeset 5948

Timestamp:

11/10/07 13:19:52 (1 year ago)

Author:

Leon.van.der.Ree

Message:

Split some work of DrCore? out of this plugin, to a seperate generator (which is not depended on Extjs)
Hacked autocomplete, need some polishing ;)

Files:

• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/actions/actions.class.php (modified) (5 diffs)
• plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_list_ajax_layout.php (modified) (1 diff)
• plugins/sfExtjsThemePlugin/lib/sfAdminCustomGenerator.php (added)
• plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php (modified) (4 diffs)

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/actions/actions.class.php

@@ -29 +29 @@
-    }
-    $class = ucfirst(strtolower($this->getRequestParameter('class')));
-// TODO, add the application-setting, DO THIS ALSO FOR THE NORMAL JSON-DATA action
-20
+
+sfConfig::get('app_sf_extjs_theme_plugin_list_max_per_page', 20)
-    $page = floor($this->getRequestParameter('start', 0) / $limit)+1;
-
@@ -37 +37 @@
-    // filter, define namespace to autocomplete, to not disturb normal filters of this module
-    $this->processFilters("autocomplete");
+
+<?php if ($this->getParameterValue('list.filters')): ?>
+    $this->filters = $this->getUser()->getAttributeHolder()->getAll('sf_admin/autocomplete/filters');
+<?php endif; ?>
+
-
-    // pager
@@ -56 +61 @@
-  public function executeJsonList()
-  {
-20
+sfConfig::get('app_sf_extjs_theme_plugin_list_max_per_page', 20)
-    $page = floor($this->getRequestParameter('start', 0) / $limit)+1;
-
@@ -565 +570 @@
-  protected function addFiltersCriteria($c, $namespace = "<?php echo $this->getSingularName() ?>")
-  {
-
-
+
+
+
-<?php $type = $column->getCreoleType() ?>
-<?php if (($column->isPartial() || $column->isComponent()) && $this->getParameterValue('list.fields.'.$column->getName().'.filter_criteria_disabled')) continue ?>
@@ -619 +625 @@
-      $c->add(<?php echo $this->getPeerClassName() ?>::<?php echo strtoupper($column->getName()) ?>, strtr($this->filters['<?php echo $column->getName() ?>'].$q, '*', '%'), Criteria::LIKE);
-<?php else: ?>
-
+
+
+
+
+
+
+
+
+
+
+
-<?php endif; ?>
-    }

plugins/sfExtjsThemePlugin/data/generator/sfPropelAdmin/extjs/template/templates/_list_ajax_layout.php

@@ -228 +228 @@
-//TODO: sortInfo columnName can be wrong! now the latest column is taken, you should be able to set this.
-    $options = array('url' => $url,
+                     'baseParams' => array('filter' => 'query'),
-                     'reader' => $jsReader,
-                     'sortInfo' => array('field' => $class.'_'.$columnName, 'direction' => 'asc'),

plugins/sfExtjsThemePlugin/lib/sfExtjsPropelAdminGenerator.php

@@ -1 +1 @@
-<?php
-/**
-and extjs possibility to the existing admin generator
+regarding Extjs2 to the sfAdminCustomGenerator from DrCore
- * - related fields
- * To use add the following to generate.yml:
@@ -7 +7 @@
- *
- */
-PropelAdmin
+AdminCustom
-{
-  /**
@@ -196 +196 @@
-  
-  /**
-   * Build function to retrieve column value
-   *
-   * @param object column $column
-   * @param boolean $developed (optional) writes out function with current class
-   * @param string $prefix
-   */
-  function getColumnGetter($column, $developed = false, $prefix = '')
-  {
-    // Setup get method
-    $getter = 'get'.$this->processColumnName($column->getPhpName());
-
-    if ($developed)
-    {
-      $getter = sprintf('$%s%s->%s()', $prefix, $this->getSingularName(), $getter);
-    }
-    return $getter;
-  }
-
-  /**
-   * Process the column name to check for foreign model peer classes
-   * A dot indicates the existence of a foreign model peer, like:
-   *   modelpeer.modelpeer.field
-   * If fieldname is empty after dot, the __toString method is called.
-   * @param string $phpName column name to process
-   * @param string $method (optional) function prefix
-   */
-  private function processColumnName($PhpName, $method = 'get')
-  {
-    // Detect if there is a dot indicating foreign model peer class
-    if (false !== strpos($PhpName, '::'))
-    {
-      list($peer, $PhpName) = explode('::', $PhpName, 2);
-      $peer = ucfirst(strtolower($peer));
-
-      // Reiterate for deeper link
-      $PhpName = $this->processColumnName($PhpName);
-
-      // _ means use __toString method of model peer class
-      if ($PhpName == '')
-      {
-        return $peer;
-      }
-      // Use foreign model peer class
-      else
-      {
-        return sprintf('%s()->%s%s', $peer, $method, $PhpName);
-      }
-    }
-    else
-    {
-      return $PhpName;
-    }
-  }
-
-  /**
-   * Process the column name to check for foreign model peer classes
-   * A dot indicates the existence of a foreign model peer, like:
@@ -396 +341 @@
-                         'valueField' => $valueField,
-                         'displayField' => $relatedClassName."_".$relatedColumn,
-relatedClassName."_".$relatedColumn
+column->getName()
-                         'store' => strtolower($relatedClassPhpName).'_ds'
-                        );