Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
ce5e8c40
Commit
ce5e8c40
authored
6 years ago
by
Vinciane
Browse files
Options
Downloads
Patches
Plain Diff
FIX #9349 document format
parent
d80738d6
No related branches found
No related tags found
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/entity/controllers/ListInstanceController.php
+1
-2
1 addition, 2 deletions
src/app/entity/controllers/ListInstanceController.php
src/frontend/app/administration/user/users-administration.component.ts
+178
-178
178 additions, 178 deletions
...app/administration/user/users-administration.component.ts
with
179 additions
and
180 deletions
src/app/entity/controllers/ListInstanceController.php
+
1
−
2
View file @
ce5e8c40
...
@@ -113,7 +113,6 @@ class ListInstanceController
...
@@ -113,7 +113,6 @@ class ListInstanceController
DatabaseModel
::
beginTransaction
();
DatabaseModel
::
beginTransaction
();
foreach
(
$data
[
'listinstances'
]
as
$ListInstanceByRes
)
{
foreach
(
$data
[
'listinstances'
]
as
$ListInstanceByRes
)
{
if
(
empty
(
$ListInstanceByRes
[
'resId'
]))
{
if
(
empty
(
$ListInstanceByRes
[
'resId'
]))
{
DatabaseModel
::
rollbackTransaction
();
DatabaseModel
::
rollbackTransaction
();
return
$response
->
withStatus
(
400
)
->
withJson
([
'errors'
=>
'resId is empty'
]);
return
$response
->
withStatus
(
400
)
->
withJson
([
'errors'
=>
'resId is empty'
]);
...
@@ -141,7 +140,7 @@ class ListInstanceController
...
@@ -141,7 +140,7 @@ class ListInstanceController
return
$response
->
withStatus
(
400
)
->
withJson
([
'errors'
=>
'User not found or not active'
]);
return
$response
->
withStatus
(
400
)
->
withJson
([
'errors'
=>
'User not found or not active'
]);
}
}
}
elseif
(
$instance
[
'item_type'
]
==
'entity_id'
)
{
}
elseif
(
$instance
[
'item_type'
]
==
'entity_id'
)
{
$entity
=
EntityModel
::
getByEntityId
(
[
'entityId'
=>
$instance
[
'item_id'
]]
);
$entity
=
EntityModel
::
getByEntityId
([
'entityId'
=>
$instance
[
'item_id'
]]);
if
(
empty
(
$entity
)
||
$entity
[
'enabled'
]
!=
"Y"
)
{
if
(
empty
(
$entity
)
||
$entity
[
'enabled'
]
!=
"Y"
)
{
DatabaseModel
::
rollbackTransaction
();
DatabaseModel
::
rollbackTransaction
();
return
$response
->
withStatus
(
400
)
->
withJson
([
'errors'
=>
'Entity not found or not active'
]);
return
$response
->
withStatus
(
400
)
->
withJson
([
'errors'
=>
'Entity not found or not active'
]);
...
...
This diff is collapsed.
Click to expand it.
src/frontend/app/administration/user/users-administration.component.ts
+
178
−
178
View file @
ce5e8c40
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment