From a6a783c2f8fccdb11c18e5a473c433b3a8653271 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 6 Jan 2020 18:05:09 +0100
Subject: [PATCH] FEAT #9797 TIME 0:20 Fix from merge request
---
migration/19.12/migrateListTemplates.php | 7 -------
sql/data_fr.sql | 1 +
.../entity/entities-administration.component.html | 2 +-
.../autocomplete/contact-autocomplete.component.scss | 3 +--
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/migration/19.12/migrateListTemplates.php b/migration/19.12/migrateListTemplates.php
index f9b59ec7f6f..b222917eb23 100644
--- a/migration/19.12/migrateListTemplates.php
+++ b/migration/19.12/migrateListTemplates.php
@@ -52,13 +52,6 @@ foreach ($customs as $custom) {
} else {
$title = $value['object_id'];
}
- if (!empty($value['title'])) {
- $title = $value['title'];
- } elseif (!empty($value['description'])) {
- $title = $value['description'];
- } else {
- $title = $value['object_id'];
- }
$listTemplateId = \Entity\models\ListTemplateModel::create([
'title' => $title,
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 2fd433c13da..c6077cb7234 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -580,6 +580,7 @@ INSERT INTO list_templates_items (list_template_id, item_id, item_type, item_mod
INSERT INTO entities (entity_id, entity_label, short_label, enabled, adrs_1, adrs_2, adrs_3, zipcode, city, country, email, business_id, parent_entity_id, entity_type) VALUES ('ELUS', 'Ensemble des élus', 'ELUS:Ensemble des élus', 'Y', '', '', '', '', '', '', 'support@maarch.fr', '', 'VILLE', 'Direction');
INSERT INTO entities (entity_id, entity_label, short_label, enabled, adrs_1, adrs_2, adrs_3, zipcode, city, country, email, business_id, parent_entity_id, entity_type) VALUES ('CCAS', 'Centre Communal d''Action Sociale', 'Centre Communal d''Action Sociale', 'Y', '', '', '', '', '', '', 'support@maarch.fr', '', '', 'Direction');
+ALTER SEQUENCE list_templates_id_seq RESTART WITH 19;
-- Create BASKETS
TRUNCATE TABLE baskets;
diff --git a/src/frontend/app/administration/entity/entities-administration.component.html b/src/frontend/app/administration/entity/entities-administration.component.html
index 3f8b5fe68ce..f4b63f012d8 100755
--- a/src/frontend/app/administration/entity/entities-administration.component.html
+++ b/src/frontend/app/administration/entity/entities-administration.component.html
@@ -274,7 +274,7 @@
<mat-tab label="{{lang.avis}}" *ngIf="!creationMode">
<div class="row" style="margin:0px;" id="opinionCircuitContent">
<div class="col-md-12">
- <plugin-autocomplete [labelPlaceholder]="lang.addVisaSignUser" [labelList]="lang.availableUsers" [routeDatas]="['/rest/autocomplete/users/circuit?circuit=opinion']" [targetSearchKey]="'idToDisplay'" [subInfoKey]="'descriptionToDisplay'" (triggerEvent)="addElemListModelOpinion($event)"></plugin-autocomplete>
+ <plugin-autocomplete [labelPlaceholder]="lang.addUser" [labelList]="lang.availableUsers" [routeDatas]="['/rest/autocomplete/users/circuit?circuit=opinion']" [targetSearchKey]="'idToDisplay'" [subInfoKey]="'descriptionToDisplay'" (triggerEvent)="addElemListModelOpinion($event)"></plugin-autocomplete>
<mat-list *ngIf="currentEntity.opinionCircuit">
<span dnd-sortable-container [dropZones]="['boxers-zone']" [sortableData]="currentEntity.opinionCircuit.items">
<mat-list-item disableRipple="true" *ngFor="let template of currentEntity.opinionCircuit.items; let i = index" title="{{lang.move}}"
diff --git a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss
index a1557722300..a1c6cc14128 100644
--- a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss
+++ b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss
@@ -161,7 +161,6 @@
position: absolute;
right: 8px;
border-radius: 10px;
- box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.75);
}
.create-contact {
@@ -174,4 +173,4 @@
padding: 0px;
background: white;
box-shadow: 1px 0px 2px 0px rgba(0,0,0,0.12);
-}
\ No newline at end of file
+}
--
GitLab