autonomic-cooperative/opencase
Archived
0
0
Fork 0
Code Issues 43 Pull Requests Releases Wiki Activity

Made contact details not revisionable

Browse Source
This commit is contained in:
naomi
2018-04-11 11:42:45 +02:00
parent 6d63d5f328
commit 2ae3fcea56
22 changed files with 141 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/zencrm_entities/src/Form/ContactDetailsDeleteForm.php
View File

@ -5,7 +5,7 @@ namespace Drupal\zencrm_entities\Form;
use Drupal\Core\Entity\ContentEntityDeleteForm;
/**
* Provides a form for deleting Contact Details entities.
* Provides a form for deleting Contact details entities.
*
* @ingroup zencrm_entities
*/

27
modules/zencrm_entities/src/Form/ContactDetailsForm.php
View File

@ -6,7 +6,7 @@ use Drupal\Core\Entity\ContentEntityForm;
use Drupal\Core\Form\FormStateInterface;
/**
* Form controller for Contact Details edit forms.
* Form controller for Contact details edit forms.
*
* @ingroup zencrm_entities
*/
@ -19,15 +19,6 @@ class ContactDetailsForm extends ContentEntityForm {
/* @var $entity \Drupal\zencrm_entities\Entity\ContactDetails */
$form = parent::buildForm($form, $form_state);
if (!$this->entity->isNew()) {
$form['new_revision'] = [
'#type' => 'checkbox',
'#title' => $this->t('Create new revision'),
'#default_value' => FALSE,
'#weight' => 10,
];
}
$entity = $this->entity;
return $form;
@ -39,29 +30,17 @@ class ContactDetailsForm extends ContentEntityForm {
public function save(array $form, FormStateInterface $form_state) {
$entity = $this->entity;
// Save as a new revision if requested to do so.
if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
$entity->setNewRevision();
// If a new revision is created, save the current user as revision author.
$entity->setRevisionCreationTime(REQUEST_TIME);
$entity->setRevisionUserId(\Drupal::currentUser()->id());
}
else {
$entity->setNewRevision(FALSE);
}
$status = parent::save($form, $form_state);
switch ($status) {
case SAVED_NEW:
drupal_set_message($this->t('Created the %label Contact Details.', [
drupal_set_message($this->t('Created the %label Contact details.', [
'%label' => $entity->label(),
]));
break;
default:
drupal_set_message($this->t('Saved the %label Contact Details.', [
drupal_set_message($this->t('Saved the %label Contact details.', [
'%label' => $entity->label(),
]));
}

123
modules/zencrm_entities/src/Form/ContactDetailsRevisionDeleteForm.php
View File

@ -1,123 +0,0 @@
<?php
namespace Drupal\zencrm_entities\Form;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a form for deleting a Contact Details revision.
*
* @ingroup zencrm_entities
*/
class ContactDetailsRevisionDeleteForm extends ConfirmFormBase {
/**
* The Contact Details revision.
*
* @var \Drupal\zencrm_entities\Entity\ContactDetailsInterface
*/
protected $revision;
/**
* The Contact Details storage.
*
* @var \Drupal\Core\Entity\EntityStorageInterface
*/
protected $ContactDetailsStorage;
/**
* The database connection.
*
* @var \Drupal\Core\Database\Connection
*/
protected $connection;
/**
* Constructs a new ContactDetailsRevisionDeleteForm.
*
* @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
* The entity storage.
* @param \Drupal\Core\Database\Connection $connection
* The database connection.
*/
public function __construct(EntityStorageInterface $entity_storage, Connection $connection) {
$this->ContactDetailsStorage = $entity_storage;
$this->connection = $connection;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
$entity_manager = $container->get('entity.manager');
return new static(
$entity_manager->getStorage('contact_details'),
$container->get('database')
);
}
/**
* {@inheritdoc}
*/
public function getFormId() {
return 'contact_details_revision_delete_confirm';
}
/**
* {@inheritdoc}
*/
public function getQuestion() {
return t('Are you sure you want to delete the revision from %revision-date?', ['%revision-date' => format_date($this->revision->getRevisionCreationTime())]);
}
/**
* {@inheritdoc}
*/
public function getCancelUrl() {
return new Url('entity.contact_details.version_history', ['contact_details' => $this->revision->id()]);
}
/**
* {@inheritdoc}
*/
public function getConfirmText() {
return t('Delete');
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, $contact_details_revision = NULL) {
$this->revision = $this->ContactDetailsStorage->loadRevision($contact_details_revision);
$form = parent::buildForm($form, $form_state);
return $form;
}
/**
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
$this->ContactDetailsStorage->deleteRevision($this->revision->getRevisionId());
$this->logger('content')->notice('Contact Details: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Revision from %revision-date of Contact Details %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
$form_state->setRedirect(
'entity.contact_details.canonical',
['contact_details' => $this->revision->id()]
);
if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {contact_details_field_revision} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
$form_state->setRedirect(
'entity.contact_details.version_history',
['contact_details' => $this->revision->id()]
);
}
}
}

149
modules/zencrm_entities/src/Form/ContactDetailsRevisionRevertForm.php
View File

@ -1,149 +0,0 @@
<?php
namespace Drupal\zencrm_entities\Form;
use Drupal\Core\Datetime\DateFormatterInterface;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\zencrm_entities\Entity\ContactDetailsInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a form for reverting a Contact Details revision.
*
* @ingroup zencrm_entities
*/
class ContactDetailsRevisionRevertForm extends ConfirmFormBase {
/**
* The Contact Details revision.
*
* @var \Drupal\zencrm_entities\Entity\ContactDetailsInterface
*/
protected $revision;
/**
* The Contact Details storage.
*
* @var \Drupal\Core\Entity\EntityStorageInterface
*/
protected $ContactDetailsStorage;
/**
* The date formatter service.
*
* @var \Drupal\Core\Datetime\DateFormatterInterface
*/
protected $dateFormatter;
/**
* Constructs a new ContactDetailsRevisionRevertForm.
*
* @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
* The Contact Details storage.
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
* The date formatter service.
*/
public function __construct(EntityStorageInterface $entity_storage, DateFormatterInterface $date_formatter) {
$this->ContactDetailsStorage = $entity_storage;
$this->dateFormatter = $date_formatter;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('entity.manager')->getStorage('contact_details'),
$container->get('date.formatter')
);
}
/**
* {@inheritdoc}
*/
public function getFormId() {
return 'contact_details_revision_revert_confirm';
}
/**
* {@inheritdoc}
*/
public function getQuestion() {
return t('Are you sure you want to revert to the revision from %revision-date?', ['%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime())]);
}
/**
* {@inheritdoc}
*/
public function getCancelUrl() {
return new Url('entity.contact_details.version_history', ['contact_details' => $this->revision->id()]);
}
/**
* {@inheritdoc}
*/
public function getConfirmText() {
return t('Revert');
}
/**
* {@inheritdoc}
*/
public function getDescription() {
return '';
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, $contact_details_revision = NULL) {
$this->revision = $this->ContactDetailsStorage->loadRevision($contact_details_revision);
$form = parent::buildForm($form, $form_state);
return $form;
}
/**
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
// The revision timestamp will be updated when the revision is saved. Keep
// the original one for the confirmation message.
$original_revision_timestamp = $this->revision->getRevisionCreationTime();
$this->revision = $this->prepareRevertedRevision($this->revision, $form_state);
$this->revision->revision_log = t('Copy of the revision from %date.', ['%date' => $this->dateFormatter->format($original_revision_timestamp)]);
$this->revision->save();
$this->logger('content')->notice('Contact Details: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Contact Details %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
$form_state->setRedirect(
'entity.contact_details.version_history',
['contact_details' => $this->revision->id()]
);
}
/**
* Prepares a revision to be reverted.
*
* @param \Drupal\zencrm_entities\Entity\ContactDetailsInterface $revision
* The revision to be reverted.
* @param \Drupal\Core\Form\FormStateInterface $form_state
* The current state of the form.
*
* @return \Drupal\zencrm_entities\Entity\ContactDetailsInterface
* The prepared revision ready to be stored.
*/
protected function prepareRevertedRevision(ContactDetailsInterface $revision, FormStateInterface $form_state) {
$revision->setNewRevision();
$revision->isDefaultRevision(TRUE);
$revision->setRevisionCreationTime(REQUEST_TIME);
return $revision;
}
}

115
modules/zencrm_entities/src/Form/ContactDetailsRevisionRevertTranslationForm.php
View File

@ -1,115 +0,0 @@
<?php
namespace Drupal\zencrm_entities\Form;
use Drupal\Core\Datetime\DateFormatterInterface;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageManagerInterface;
use Drupal\zencrm_entities\Entity\ContactDetailsInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Provides a form for reverting a Contact Details revision for a single translation.
*
* @ingroup zencrm_entities
*/
class ContactDetailsRevisionRevertTranslationForm extends ContactDetailsRevisionRevertForm {
/**
* The language to be reverted.
*
* @var string
*/
protected $langcode;
/**
* The language manager.
*
* @var \Drupal\Core\Language\LanguageManagerInterface
*/
protected $languageManager;
/**
* Constructs a new ContactDetailsRevisionRevertTranslationForm.
*
* @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
* The Contact Details storage.
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
* The date formatter service.
* @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
* The language manager.
*/
public function __construct(EntityStorageInterface $entity_storage, DateFormatterInterface $date_formatter, LanguageManagerInterface $language_manager) {
parent::__construct($entity_storage, $date_formatter);
$this->languageManager = $language_manager;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('entity.manager')->getStorage('contact_details'),
$container->get('date.formatter'),
$container->get('language_manager')
);
}
/**
* {@inheritdoc}
*/
public function getFormId() {
return 'contact_details_revision_revert_translation_confirm';
}
/**
* {@inheritdoc}
*/
public function getQuestion() {
return t('Are you sure you want to revert @language translation to the revision from %revision-date?', ['@language' => $this->languageManager->getLanguageName($this->langcode), '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime())]);
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, $contact_details_revision = NULL, $langcode = NULL) {
$this->langcode = $langcode;
$form = parent::buildForm($form, $form_state, $contact_details_revision);
$form['revert_untranslated_fields'] = [
'#type' => 'checkbox',
'#title' => $this->t('Revert content shared among translations'),
'#default_value' => FALSE,
];
return $form;
}
/**
* {@inheritdoc}
*/
protected function prepareRevertedRevision(ContactDetailsInterface $revision, FormStateInterface $form_state) {
$revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
/** @var \Drupal\zencrm_entities\Entity\ContactDetailsInterface $default_revision */
$latest_revision = $this->ContactDetailsStorage->load($revision->id());
$latest_revision_translation = $latest_revision->getTranslation($this->langcode);
$revision_translation = $revision->getTranslation($this->langcode);
foreach ($latest_revision_translation->getFieldDefinitions() as $field_name => $definition) {
if ($definition->isTranslatable() || $revert_untranslated_fields) {
$latest_revision_translation->set($field_name, $revision_translation->get($field_name)->getValue());
}
}
$latest_revision_translation->setNewRevision();
$latest_revision_translation->isDefaultRevision(TRUE);
$revision->setRevisionCreationTime(REQUEST_TIME);
return $latest_revision_translation;
}
}

4
modules/zencrm_entities/src/Form/ContactDetailsSettingsForm.php
View File

@ -35,7 +35,7 @@ class ContactDetailsSettingsForm extends FormBase {
}
/**
* Defines the settings form for Contact Details entities.
* Defines the settings form for Contact details entities.
*
* @param array $form
* An associative array containing the structure of the form.
@ -46,7 +46,7 @@ class ContactDetailsSettingsForm extends FormBase {
* Form definition array.
*/
public function buildForm(array $form, FormStateInterface $form_state) {
$form['contactdetails_settings']['#markup'] = 'Settings form for Contact Details entities. Manage field settings here.';
$form['contactdetails_settings']['#markup'] = 'Settings form for Contact details entities. Manage field settings here.';
return $form;
}