Author: echatellier Date: 2014-07-15 17:37:06 +0200 (Tue, 15 Jul 2014) New Revision: 391 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/391 Log: refs #5433: Commentaire des archives en attendant de comprendre leur but Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 09:43:42 UTC (rev 390) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 15:37:06 UTC (rev 391) @@ -69,6 +69,7 @@ model.setDemandStatus(DemandStatus.ARCHIVED); model.setTakenBy(null); + /* FIXME see #5433: Supprimer les dossiers d'archives MailFolder folder = model.getMailFolder(); MailFolder archiveChild = null; do { @@ -90,7 +91,7 @@ if (archiveChild != null) { model.setMailFolder(archiveChild); - } + }*/ super.doAction(); } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-15 09:43:42 UTC (rev 390) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-15 15:37:06 UTC (rev 391) @@ -240,7 +240,9 @@ <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}}</a> + <%-- FIXME see #5433: Supprimer les dossiers d'archives <a class="pull-right btn btn-info btn-xs" data-nodrag ng-click="newArchiveSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.hasArchiveFolder && !mailFolder.archiveFolder" tooltip="Créer un dossier d'archive"><span class="glyphicon glyphicon-plus"></span></a> + --%> <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder" tooltip="Créer un sous-dossier"><span class="glyphicon glyphicon-plus"></span></a> <span class="pull-right" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes et ne peut pas être supprimé !'|| 'Supprimer ce dossier'}}"> <a class="btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0"> @@ -806,6 +808,7 @@ </div> </div> </div> + <%-- FIXME see #5433: Supprimer les dossiers d'archives <div class="col-md-8" ng-show="selectedMailFolder.archiveFolder"> <h3>Édition du dossier {{selectedMailFolder.name}}</h3> @@ -885,7 +888,7 @@ </div> </div> </div> - </div> + </div>--%> </div> </div>