diff --git a/src/protected/application/lib/modules/Diligence/Controllers/Controller.php b/src/protected/application/lib/modules/Diligence/Controllers/Controller.php index 6290627ef..601e5aee2 100644 --- a/src/protected/application/lib/modules/Diligence/Controllers/Controller.php +++ b/src/protected/application/lib/modules/Diligence/Controllers/Controller.php @@ -36,7 +36,7 @@ public function POST_save(): void $isDiligence = $app->repo('Diligence\Entities\Diligence')->findOneBy(['registration' => $this->data['registration']]); - if(is_null($isDiligence)){ + if(is_null($isDiligence) || $isDiligence->open_agent_id == $app->user->profile_id){ if (($this->data['idDiligence'] ?: 0) == 0 && (is_null($registration->opportunity->use_multiple_diligence) || $registration->opportunity->use_multiple_diligence === 'Não')) { $diligences = $app->repo(EntityDiligence::class)->findBy([ 'registration' => $registration, diff --git a/src/protected/application/lib/modules/Diligence/assets/css/diligence/style.css b/src/protected/application/lib/modules/Diligence/assets/css/diligence/style.css index bf1809bad..bb9f838df 100644 --- a/src/protected/application/lib/modules/Diligence/assets/css/diligence/style.css +++ b/src/protected/application/lib/modules/Diligence/assets/css/diligence/style.css @@ -21,7 +21,7 @@ .btn-send-diligence { font-size: medium; - border: none; + border: 1px solid #10776d; font-weight: 600; cursor: pointer; background: #085E55; diff --git a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/btn-actions-proponent.php b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/btn-actions-proponent.php index 8b22ffa87..660f4f414 100644 --- a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/btn-actions-proponent.php +++ b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/btn-actions-proponent.php @@ -48,7 +48,7 @@ Salvar - diff --git a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/description.php b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/description.php index 7597611af..3a4f01843 100644 --- a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/description.php +++ b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/description.php @@ -1,2 +1,10 @@ - + + \ No newline at end of file diff --git a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/proponent.php b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/proponent.php index 9ea6f9700..c72c614cd 100644 --- a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/proponent.php +++ b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/proponent.php @@ -104,7 +104,7 @@
part('diligence/description', ['placeHolder' => $placeHolder]); + $this->part('diligence/description', ['placeHolder' => $placeHolder, 'isProponent' => $context['isProponent']]); $this->part('diligence/message-success-draft'); $this->part('diligence/btn-actions-proponent', ['entity' => $context['entity'], 'showText' => $showText]); } diff --git a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/tabs-parent.php b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/tabs-parent.php index 15e35a9d5..523520b79 100644 --- a/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/tabs-parent.php +++ b/src/protected/application/lib/modules/Diligence/layouts/parts/diligence/tabs-parent.php @@ -23,7 +23,6 @@ //Tado $tado = DiligenceRepo::getTado($context['entity']); - ?> applyTemplateHook('tabs', 'before'); @@ -99,7 +98,7 @@
part('diligence/description', ['placeHolder' => $placeHolder]); + $this->part('diligence/description', ['placeHolder' => $placeHolder, 'isProponent' => $context['isProponent']]); $this->part('diligence/message-success-draft'); $this->part('diligence/btn-actions-diligence', [ 'entity' => $context['entity'], diff --git a/src/protected/application/plugins/OpinionManagement b/src/protected/application/plugins/OpinionManagement index 2fd300992..1b4ac8387 160000 --- a/src/protected/application/plugins/OpinionManagement +++ b/src/protected/application/plugins/OpinionManagement @@ -1 +1 @@ -Subproject commit 2fd300992d03d230c6167fe2212ff47fa7c2ec41 +Subproject commit 1b4ac8387aa7cfb67108f8d3e7dcfa9eb9b59519