Changeset 62

Timestamp:

07/12/08 13:41:34 (4 months ago)

Author:

nperriault

Message:

[1.1] added es translation + advance in forms migration

Files:

• trunk/apps/main/config/config.php (deleted)
• trunk/apps/main/config/factories.yml (modified) (1 diff)
• trunk/apps/main/i18n/es (added)
• trunk/apps/main/i18n/es/messages.xml (added)
• trunk/apps/main/lib/myActions.class.php (modified) (10 diffs)
• trunk/apps/main/modules/applications/actions/actions.class.php (modified) (1 diff)
• trunk/config/app.yml-dist (modified) (1 diff)
• trunk/config/search.yml (modified) (1 diff)
• trunk/lib/form/BlogPostForm.class.php (added)
• trunk/lib/form/application/ApplicationForm.class.php (modified) (3 diffs)
• trunk/lib/model/Application.php (modified) (2 diffs)
• trunk/lib/model/ApplicationPeer.php (modified) (1 diff)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/om/BasesfLocalization.php (modified) (3 diffs)
• trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/om/BasesfLocalizationPeer.php (modified) (4 diffs)

trunk/apps/main/config/factories.yml

@@ +1 @@
+prod:
+  logger:
+    class:   sfNoLogger
+    param:
+      level:   err
+      loggers: ~
-prod:
-  logger:

trunk/apps/main/lib/myActions.class.php

@@ -92 +92 @@
-  protected function purgeHomepage()
-  {
-
-
+
-    {
-      $cacheManager->remove('home/index');
@@ -101 +100 @@
-  protected function purgeHomepages()
-  {
-
-
+
-    {
-      $cacheManager->remove('applications/home');
@@ -116 +114 @@
-  protected function purgeApplicationRelatedCache(Application $application)
-  {
-
-
+
-    {
-      $cacheManager->remove('applications/home');
@@ -132 +129 @@
-  protected function purgeCompanyRelatedCache(Company $company)
-  {
-
-
+
-    {
-      $cacheManager->remove('companies/home');
@@ -148 +144 @@
-  protected function purgeJobRelatedCache(Job $job)
-  {
-
-
+
-    {
-      $cacheManager->remove('jobs/home');
@@ -164 +159 @@
-  protected function purgePersonRelatedCache(sfGuardUser $person)
-  {
-
-
+
-    {
-      $cacheManager->remove('people/home');
@@ -176 +170 @@
-  protected function purgeRecommendationRelatedCache(Recommendation $recommendation)
-  {
-
-
+
-    {
-      $cacheManager->remove('people/details?username='.$recommendation->getsfGuardUserRelatedByRecommendedId()->getUsername());
@@ -188 +181 @@
-  protected function purgeApplicationCompanyRelatedCache(ApplicationCompany $app_company)
-  {
-
-
+
-    {
-      $cacheManager->remove('application/details?slug='.$app_company->getApplication()->getSlug());
@@ -200 +192 @@
-  protected function purgeApplicationDeveloperRelatedCache(ApplicationDeveloper $app_person)
-  {
-
-
+
-    {
-      $cacheManager->remove('application/details?slug='.$app_person->getApplication()->getSlug());
@@ -212 +203 @@
-  protected function purgeCompanyPersonRelatedCache(CompanyPerson $company_person)
-  {
-
-
+
-    {
-      $cacheManager->remove('company/details?slug='.$company_person->getCompany()->getSlug());

trunk/apps/main/modules/applications/actions/actions.class.php

@@ -43 +43 @@
-    {
-      // Set the submitter id from the session
+      $submitter_id = $this->getUser()->isAdmin() && $application->getSubmitterId() ? $application->getSubmitterId() : $this->getUser()->getId();
-      $params = array_merge($request->getParameter('application'), 
-this->getUser()->getId()
+submitter_id
-      $this->form->bind($params, $request->getFiles('application'));
-      
-!$this->form->save(
+is_null($this->form->save()
-      {
-        return sfView::SUCCESS;

trunk/config/app.yml-dist

@@ -31 +31 @@
-
-  cultures:
-
+, pt, es
-
-  events:

trunk/config/search.yml

@@ -119 +119 @@
-
-  index:
-
+, pt, es
-    encoding:               UTF-8
-      analyzer:             utf8num

trunk/lib/form/application/ApplicationForm.class.php

@@ -13 +13 @@
-    $context = sfContext::getInstance();
-    $culture = $context->getUser()->getCulture();
-
+//
-    
-    // Unset unused widgets
-
+
+
-          $this['updated_at'],
-          $this['slug'], 
@@ -29 +30 @@
-    
-    // Overriding validators
--_
+.-_,
-    $this->validatorSchema['screenshot_path'] = new sfValidatorFile(array('max_size' => 512000, 'required' => false)); 
-    $this->validatorSchema['country']         = new sfValidatorI18nChoiceCountry(array('culture' => $culture, 'required' => false));
@@ -40 +41 @@
-      new sfValidatorUrl(),
-      new sfValidatorChoice(array('choices' => array('http://', ''))),
-, array('required' => false)
+
-    
-    // Defaults

trunk/lib/model/Application.php

@@ -17 +17 @@
-    return $this->getName();
-  }
+  
+  /**
+   * Fills current Application with array parameters, including tags
+   *
+   * @param  array   $arr
+   * @param  string  $keyType
+   */
+  public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME)
+  {
+    parent::fromArray($arr, $keyType);
+    
+    foreach (array('tags', 'Tags') as $tagField)
+    {
+      if (array_key_exists($tagField, $arr))
+      {
+        $this->setTags($arr[$tagField]);
+      }
+    }
+  }
+  
+  /**
+   * Converts current Application to an associative array
+   *
+   * @param  string $keyType
+   * @return array
+   */
+  public function toArray($keyType = BasePeer::TYPE_PHPNAME)
+  {
+    $arr = parent::toArray($keyType);
+    
+    if (BasePeer::TYPE_FIELDNAME == $keyType)
+    {
+      $arr['tags'] = $this->getTagsString();
+    }
+    else if (BasePeer::TYPE_PHPNAME == $keyType)
+    {
+      $arr['Tags'] = $this->getTagsString();
+    }
+    
+    return $arr;
+  }
-
-  /**
@@ -186 +227 @@
-    $c->add(ApplicationCompanyPeer::COMPANY_ID, $company_id);
-    return ($this->countApplicationCompanys($c) > 0);
+  }
+  
+  /**
+   * Checks if an application is owned by a given user
+   *
+   * @param int|sfGuardUser $user
+   */
+  public function isOwnedBy($user_id)
+  {
+    if ($user_id instanceof sfGuardUser)
+    {
+      $user_id = $user_id->getId();
+    }
+    
+    return ($this->getSubmitterId() === $user_id);
-  }
-

trunk/lib/model/ApplicationPeer.php

@@ -65 +65 @@
-    return $results;
-  }
-
+
-  /**
-   * Get recent applications

trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/om/BasesfLocalization.php

@@ -73 +73 @@
-        {
-
-
-
-
+
-                        $v = (int) $v;
-                }
@@ -89 +87 @@
-        {
-
-
-
-
+
-                        $v = (string) $v; 
-                }
@@ -105 +101 @@
-        {
-
-
-
-
+
-                        $v = (int) $v;
-                }

trunk/plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/om/BasesfLocalizationPeer.php

@@ -58 +58 @@
-        public static function getMapBuilder()
-        {
-                include_once 'plugins/sfPropelActAsLocalizableBehaviorPlugin/lib/model/map/sfLocalizationMapBuilder.php';
-                return BasePeer::getMapBuilder('plugins.sfPropelActAsLocalizableBehaviorPlugin.lib.model.map.sfLocalizationMapBuilder');
-        }
@@ -165 +164 @@
-        {
-
-addDoSelectRS:addD
+doSelectRS:d
-    {
-      call_user_func($callable, 'BasesfLocalizationPeer', $criteria, $con);
@@ -200 +199 @@
-                return $results;
-        }
+
+  static public function getUniqueColumnNames()
+  {
+    return array(array('model_name', 'model_id'));
+  }
-        
-        public static function getTableMap()
@@ -422 +426 @@
-        }
-} else {
-
-
+
-}