Changeset 68

Timestamp:

07/14/08 09:25:04 (2 years ago)

Author:

nperriault

Message:

[1.1] everything is broken \o/

Files:

• trunk/apps/main/config/routing.yml (modified) (1 diff)
• trunk/apps/main/modules/applications/actions/actions.class.php (modified) (8 diffs)
• trunk/apps/main/modules/applications/templates/connectAsDeveloperSuccess.php (modified) (3 diffs)
• trunk/data/migrations/005_m1.php (added)
• trunk/lib/form/ActivationForm.class.php (copied) (copied from trunk/lib/form/user/ActivationForm.class.php)
• trunk/lib/form/ApplicationCompanyForm.class.php (copied) (copied from trunk/lib/form/application/ApplicationCompanyForm.class.php)
• trunk/lib/form/ApplicationDeveloperForm.class.php (copied) (copied from trunk/lib/form/application/ApplicationDeveloperForm.class.php) (1 diff)
• trunk/lib/form/ApplicationForm.class.php (copied) (copied from trunk/lib/form/application/ApplicationForm.class.php) (2 diffs)
• trunk/lib/form/BlogPostForm.class.php (copied) (copied from trunk/lib/form/blog/BlogPostForm.class.php)
• trunk/lib/form/CompanyForm.class.php (copied) (copied from trunk/lib/form/company/CompanyForm.class.php)
• trunk/lib/form/CompanyPersonForm.class.php (copied) (copied from trunk/lib/form/company/CompanyPersonForm.class.php)
• trunk/lib/form/CountrySelectorForm.class.php (copied) (copied from trunk/lib/form/l10n/CountrySelectorForm.class.php)
• trunk/lib/form/EventForm.class.php (copied) (copied from trunk/lib/form/event/EventForm.class.php)
• trunk/lib/form/JobForm.class.php (copied) (copied from trunk/lib/form/job/JobForm.class.php)
• trunk/lib/form/LocalEventForm.class.php (copied) (copied from trunk/lib/form/localEvent/LocalEventForm.class.php)
• trunk/lib/form/RecommendationForm.class.php (copied) (copied from trunk/lib/form/user/RecommendationForm.class.php)
• trunk/lib/form/RegisterForm.class.php (copied) (copied from trunk/lib/form/user/RegisterForm.class.php)
• trunk/lib/form/ResendActivationForm.class.php (copied) (copied from trunk/lib/form/user/ResendActivationForm.class.php)
• trunk/lib/form/SigninForm.class.php (copied) (copied from trunk/lib/form/user/SigninForm.class.php)
• trunk/lib/form/application (deleted)
• trunk/lib/form/blog (deleted)
• trunk/lib/form/company (deleted)
• trunk/lib/form/event (deleted)
• trunk/lib/form/job (deleted)
• trunk/lib/form/l10n (deleted)
• trunk/lib/form/localEvent (deleted)
• trunk/lib/form/user (deleted)
• trunk/lib/utils/sfValidatedThumb.class.php (added)
• trunk/plugins (modified) (1 prop)
• trunk/test/functional/main/applicationsActionsTest.php (modified) (5 diffs)

trunk/apps/main/config/routing.yml

@@ -120 +120 @@
-application_add:
-  url:   /application/add
-add
+edit
-
-application_edit:

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

@@ -9 +9 @@
-{
-
-  public function executeAdd(sfWebRequest $request)
-  {
-    $this->forward('applications', 'edit');
-  }
-
-  public function executeCountries(sfWebRequest $request)
-  {
@@ -21 +16 @@
-  public function executeEdit(sfWebRequest $request)
-  {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-      $application = new Application();
+      $this->setTemplate('add');
+      $message = $this->__('Application added');
+      $redirect = '@application_connect_as_developer?slug=%s';
-      $creation = true;
-      $this->setTemplate('add');
-    }
-    
-    if (!$creation && !$this->getUser()->isAdmin() && $application->getSubmitterId() != $this->getUser()->getId())
-    {
-      $this->getUser()->setFlash('warning', $this->__('You are not allowed to edit this record'));
-      $this->redirect('@application_page?slug='.$application->getSlug());
-    }
-    
@@ -53 +59 @@
-      }
-      
+      /* @var $application Application */
-      $application = $this->form->getObject();
-      
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      
-      parent::purgeObjectRelatedCache($application);
-      
-      if (isset($creation) && true === $creation)
-      {
-        $message = $this->__('Application added');
-        $redirect = '@application_connect_as_developer?slug='.$application->getSlug();
-      }
-      else
-      {
-        $message = $this->__('Application updated');
-        $redirect = '@application_page?slug='.$application->getSlug();
-      }
-      
-      $this->getUser()->setFlash('notice', $message);
-$creation
-$redirect
+is_null($request->getParameter('slug'))
+sprintf($redirect, $application->getSlug())
-    }
-  }
@@ -102 +111 @@
-    $this->connection = ApplicationDeveloperPeer::retrieveByPK($this->getRequestParameter('id'));
-    $this->forward404Unless($this->connection, 'ApplicationDeveloper not found');
+    $this->form = new ApplicationDeveloperForm($this->connection);
-
-    if ($request->isMethod('post'))
@@ -147 +157 @@
-    $this->connection = new ApplicationDeveloper();
-    $this->application = $this->getFromSlug();
+    $this->form = new ApplicationDeveloperForm($this->connection);
-
-    // Checks if a relation already exists for this person
@@ -162 +173 @@
-    if ($request->isMethod('post'))
-    {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -312 +329 @@
-  }
-
-  public function handleErrorEdit()
-  {
-    $this->application = $this->getFromSlug();
-    return sfView::SUCCESS;
-  }
-
-  public function handleErrorEditCompanyConnection()
-  {
-    $this->application = $this->getFromSlug();
-    $this->connection = ApplicationCompanyPeer::retrieveByPK($this->getRequestParameter('id'));
-    $this->forward404Unless($this->connection, 'ApplicationCompany not found');
-    $this->form_action = sprintf('@application_edit_company_connection?slug=%s&id=%d',
-                                 $this->application->getSlug(),
-                                 $this->connection->getId());
-    $this->setTemplate('connectAsCompany');
-    return sfView::SUCCESS;
-  }
-
-  public function handleErrorEditDeveloperConnection()
-  {
-    $this->application = $this->getFromSlug();
-    $this->connection = ApplicationDeveloperPeer::retrieveByPK($this->getRequestParameter('id'));
-    $this->forward404Unless($this->connection, 'ApplicationDeveloper not found');
-    $this->form_action = sprintf('@application_edit_developer_connection?slug=%s&id=%d',
-                                 $this->application->getSlug(),
-                                 $this->connection->getId());
-    $this->setTemplate('connectAsDeveloper');
-    return sfView::SUCCESS;
-  }
-  
-  /**
-   * Process uploaded image file and updates passed Application object with the
@@ -373 +360 @@
-  }
-
-  public function handleErrorConnectAsCompany()
-  {
-    $this->connection = new ApplicationCompany();
-    $this->application = $this->getFromSlug();
-    $this->form_action = sprintf('@application_connect_as_company?slug=%s',
-                                 $this->application->getSlug());
-    return sfView::SUCCESS;
-  }
-
-  public function handleErrorConnectAsDeveloper()
-  {
-    $this->connection = new ApplicationDeveloper();
-    $this->application = $this->getFromSlug();
-    $this->form_action = sprintf('@application_connect_as_developer?slug=%s',
-                                 $this->application->getSlug());
-    return sfView::SUCCESS;
-  }
-
-  protected function updateCompanyConnectionFromRequest()
-  {
-    $connection_data = $this->getRequestParameter('connection', array());
-
-    if (isset($connection_data['started_at']) && $connection_data['started_at'] == '')
-    {
-      unset($connection_data['started_at']);
-    }
-    if (isset($connection_data['ended_at']) && $connection_data['ended_at'] == '')
-    {
-      unset($connection_data['ended_at']);
-    }
-
-    try
-    {
-      $this->connection->fromArray($connection_data, BasePeer::TYPE_FIELDNAME);
-      $this->connection->setApplication($this->application);
-      $this->connection->setSubmitterId($this->getUser()->getId());
-      $this->connection->save();
-    }
-    catch (Exception $e)
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save this relation'));
-      sfContext::getInstance()->getLogger()->err('Blocking error at ApplicationCompany save time: '.$e->getMessage());
-    }
-  }
-
-  protected function updateDeveloperConnectionFromRequest()
-  {
-    $connection_data = $this->getRequestParameter('connection', array());
-
-    if (isset($connection_data['started_at']) && $connection_data['started_at'] == '')
-    {
-      unset($connection_data['started_at']);
-    }
-    if (isset($connection_data['ended_at']) && $connection_data['ended_at'] == '')
-    {
-      unset($connection_data['ended_at']);
-    }
-
-    try
-    {
-      $this->connection->fromArray($connection_data, BasePeer::TYPE_FIELDNAME);
-      $this->connection->setDeveloperId($this->getUser()->getId());
-      $this->connection->setApplication($this->application);
-      $this->connection->save();
-    }
-    catch (Exception $e)
-    {
-      $this->getRequest()->setError('errors', $this->__('Unable to save this relation'));
-      sfContext::getInstance()->getLogger()->err('Blocking error at ApplicationDeveloper save time: '.$e->getMessage());
-    }
-  }
-
-}

trunk/apps/main/modules/applications/templates/connectAsDeveloperSuccess.php

@@ -41 +41 @@
-      <legend><?php echo __('Connection informations') ?></legend>
-      <div class="form-row required">
-label for="role"><?php echo __('Your role in this project') ?></label
-object_input_tag($connection, 'getRole', 'name=connection[role]', $sf_params->get('connection[role]')
-form_error('connection[role]'
+?php echo $form['role']->renderLabel(__('Your role in this project')) ?
+$form['role']->render(
+$form['role']->renderError(
-      </div>
-      <div class="form-row">
-label for="description"><?php echo __('Description of your work') ?></label
-object_textarea_tag($connection, 'getDescription', 'name=connection[description]', $sf_params->get('connection[description]')
-form_error('connection[description]'
+?php echo $form['description']->renderLabel(__('Description of your work')) ?
+$form['description']->render(
+$form['description']->renderError(
-      </div>
-    </fieldset>
@@ -55 +55 @@
-    <fieldset>
-      <legend><?php echo __('Timeline') ?></legend>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      </div>
-    </fieldset>
@@ -69 +71 @@
-  <div class="form-row" style="text-align:center;clear:left;">
-    <p>
-
-
+
+
+
-    </p>
-  </div>

trunk/lib/form/ApplicationDeveloperForm.class.php

@@ -12 +12 @@
-  public function configure()
-  {
+    $context = sfContext::getInstance();
+    $culture = $context->getUser()->getCulture();
+    
+    unset($this['id']);
+    
+    // Widgets
+    $this->widgetSchema['started_at']     = new sfWidgetFormI18nDate(array('culture' => $culture));
+    $this->widgetSchema['ended_at']    = new sfWidgetFormI18nDate(array('culture' => $culture));
+    
+    // Validators
+    $this->validatorSchema['started_at']  = new sfValidatorDate(array('required' => false));
+    $this->validatorSchema['ended_at'] = new sfValidatorDate(array('required' => false));
+    $this->validatorSchema['role'] = new sfValidatorString(array('max_length' => 255, 'required' => true));
+    
+    $this->widgetSchema->setNameFormat('connection[%s]');
-  }
-}

trunk/lib/form/ApplicationForm.class.php

@@ -13 +13 @@
-    $context = sfContext::getInstance();
-    $culture = $context->getUser()->getCulture();
-    //sfLoader::loadHelpers('I18n');
-    
-    // Unset unused widgets
@@ -31 +30 @@
-    // Overriding validators
-    $this->validatorSchema['tags']            = new sfValidatorRegex(array('pattern' => '/[0-9\w.-_, ]/i', 'required' => false));
-
+
+
+
+
-    $this->validatorSchema['country']         = new sfValidatorI18nChoiceCountry(array('culture' => $culture, 'required' => false));
-    $this->validatorSchema['started_at']      = new sfValidatorDate(array('required' => false));

trunk/test/functional/main/applicationsActionsTest.php

@@ -8 +8 @@
-
-$browser->
+  
+  // Check application home
-  get('/applications')->
-  isStatusCode(200)->
@@ -22 +24 @@
-  checkResponseElement('.thumbs_list h4', '/Crédinoé/', array('position' => 5))->
-
+  // Check application page
-  click('Splitgames')->
-  isStatusCode(200)->
@@ -35 +38 @@
-  signInUser('/application/add')->
-  isStatusCode(200)->
+  
+  // Create a new application
-  setField('application[name]', 'My test app')->
-  click('Add this application')->
@@ -41 +46 @@
-  isRequestParameter('action', 'add')->
-  followRedirect()->
+  
+  // Connect as developer
-  isRequestParameter('module', 'applications')->
-  isRequestParameter('action', 'connectAsDeveloper')->
-
+
+
+
+
+
+
+
+
+
+
+
-  isRequestParameter('module', 'applications')->
-  isRequestParameter('action', 'details')->
-  isRequestParameter('slug', 'my-test-app')->
-
+
+
+
-  click('Edit this application informations')->
-  isRequestParameter('module', 'applications')->
@@ -59 +78 @@
-  isRequestParameter('action', 'details')->
-  isRequestParameter('slug', 'my-test-app')->
-
+
+
-;