From bcd61fbe89f2ca407851aae55cfaf6923d333c78 Mon Sep 17 00:00:00 2001
From: Charlotte Bataille <charlotte.bataille@xelians.fr>
Date: Mon, 11 Jul 2022 15:37:51 +0200
Subject: [PATCH] rebase develop onto 2.9 : fix merge conflit
---
.../dashboard/mainScreen/archiveForm.html | 24 -------------------
1 file changed, 24 deletions(-)
diff --git a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveForm.html b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveForm.html
index 8805a15f1..096861a32 100755
--- a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveForm.html
+++ b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveForm.html
@@ -30,30 +30,6 @@
</div>
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">Originator organization</label>
- <div class="col-sm-9">
- <select class="form-control archiveInput" name="orgRegNumberSelect" id="orgRegNumberSelect">
- <?merge orgUnitList ?>
- <option value="[?merge .registrationNumber ?]"><?merge .displayName ?></option>
- </select>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">Archival profile</label>
- <div class="col-sm-9">
- <select class="form-control archiveInput" name="archivalProfileSelect" id="archivalProfileSelect">
- <option value=""></option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <h4 class="pull-left">
- <span id="import_archivalProfile"/>
- <br/>
- <small id="import_isSubArchive"><span>Sub-archive of </span><span id="import_parentArchiveName"><b></b></span></small>
- </h4>
- </div>
- </div>
<div class="form-group">
<label class="col-sm-3 control-label">Name</label>
<div class="col-sm-9">
--
GitLab