Skip to content

Merge sdis29 #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A643206 wants to merge 3 commits into
base: 2.x
Choose a base branch
from
Open

Merge sdis29 #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e54f8b
[FIX #2791] deplacer le bouton de suppresion
A643206 Nov 27, 2017
9fba86d
[FIX #2791] Déplacer le bouton de suppression
A643206 Nov 27, 2017
966cb23
Ajout fichier sql 'ajoutDroitsSuppression.sql'
A643206 Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions application/layouts/dossier.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
<a class="sep" href='/calendrier-des-commissions/gestionodj/dateCommId/<?php echo $this->idDateCommissionAffect; ?>'><i class='icon-calendar icon-black'></i> Afficher ordre du jour</a>
</li>
<?php endif; ?>
<?php if(!$verrou && $this->is_allowed_delete_dossier) : ?>
<li>
<a id="suppressionDossier" href="#"><i class="icon-remove icon-black"></i>Supprimer le dossier</a>
</li>
<?php endif; ?>
</ul>
<?php $this->placeholder('lateral_navigation')->captureEnd();
endif; ?>
Expand Down
7 changes: 6 additions & 1 deletion application/layouts/etablissement.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
<li class="<?php echo $action_name == 'historique' ? 'active' : '' ?>"><a class='sep' href='<?php echo $this->url(array("action"=>"historique")) ?>'><i class="icon-repeat icon-black"></i> Afficher l'historique</a></li>
<li class="nav-header">Actions</li>
<li><a href='<?php echo $this->url(array('controller' => 'dossier', 'action' => 'add', 'id_etablissement' => $this->etablissement['general']['ID_ETABLISSEMENT']), null, true)?> '><i class="icon-plus icon-black"></i> Ajouter un dossier</a></li>
</ul>
<?php if($this->is_allowed_delete_etablissement): ?>
<li>
<a id="suppressionEtablissement" href="#"><i class="icon-remove icon-black"></i>Supprimer l'établissement</a>
</li>
<?php endif ?>
</ul>
<?php $this->placeholder('lateral_navigation')->captureEnd(); ?>
<?php $this->placeholder('before_content')->captureStart(); // Capture du 'before_content' ?>

Expand Down
14 changes: 14 additions & 0 deletions sql/migrations/2.5-02-ajoutDroitsSuppression.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
set names 'utf8';

#Ajout de la resource de suppression
INSERT INTO PRV_prevarisc_v2.resources (id_resource, name, text) VALUES (60, 'suppression', 'Suppression');

#Ajout des privileges de suppression
INSERT INTO PRV_prevarisc_v2.privileges (id_privilege, name, text, id_resource) VALUES (70, 'delete_dossier', 'Suppression des dossiers', 60);
INSERT INTO PRV_prevarisc_v2.privileges (id_privilege, name, text, id_resource) VALUES (71, 'delete_etablissement', 'Suppression des établissements', 60);

#Ajout flag dossier pour suppression
ALTER TABLE PRV_prevarisc_v2.dossier ADD DATESUPPRESSION_DOSSIER DATE;

#Ajout flag etablissement pour suppression
ALTER TABLE PRV_prevarisc_v2.etablissement ADD DATESUPPRESSION_ETABLISSEMENT DATE;