Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GoGoCarto
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
17
Issues
17
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pixel Humain
GoGoCarto
Commits
15abc316
Unverified
Commit
15abc316
authored
Jul 30, 2019
by
Sebastian Castro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import add delete button and improve validation on customCode
parent
f2c0bb13
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
src/Biopen/GeoDirectoryBundle/Document/Import.php
src/Biopen/GeoDirectoryBundle/Document/Import.php
+2
-2
src/Biopen/GeoDirectoryBundle/Resources/views/admin/edit/edit_import_dynamic.html.twig
.../Resources/views/admin/edit/edit_import_dynamic.html.twig
+5
-0
No files found.
src/Biopen/GeoDirectoryBundle/Document/Import.php
View file @
15abc316
...
...
@@ -152,8 +152,8 @@ class Import extends AbstractFile
*/
public
function
validate
(
ExecutionContextInterface
$context
)
{
if
(
preg_match
(
"/new |process|mongo/i"
,
$this
->
customCode
))
{
$context
->
buildViolation
(
"Il est interdit d'utiliser les mots suivants: new, mongo, process... Merci de ne pas faire de betises !"
)
if
(
preg_match
(
"/new |process|mongo
|this|symfony
/i"
,
$this
->
customCode
))
{
$context
->
buildViolation
(
"Il est interdit d'utiliser les mots suivants: new, mongo, process
, this, symfony
... Merci de ne pas faire de betises !"
)
->
atPath
(
'customCode'
)
->
addViolation
();
}
...
...
src/Biopen/GeoDirectoryBundle/Resources/views/admin/edit/edit_import_dynamic.html.twig
View file @
15abc316
...
...
@@ -22,5 +22,10 @@
<a
href=
"
{{
admin.generateObjectUrl
(
'list'
,
object
)
}}
"
class=
"btn btn-default view_link"
>
<i
class=
"fa fa-list"
aria-hidden=
"true"
></i>
Retour à la liste
</a>
{%
if
object.id
!=
""
%}
<a
href=
"
{{
admin.generateObjectUrl
(
'delete'
,
object
)
}}
"
class=
"btn btn-danger view_link"
>
<i
class=
"fa fa-trash"
aria-hidden=
"true"
></i>
Supprimer (ainsi que tous les éléments importés)
</a>
{%
endif
%}
{%
endblock
%}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment