Commit 65a1b3bc authored by Arnaud Pauget's avatar Arnaud Pauget
Browse files

Merge branch 'fix/18394_params_in_archivalProfile' into 'develop'

Fix/18394 params in archival profile

See merge request !695
parents 31115261 1af19c60
Pipeline #14394 failed with stages
in 1 minute and 2 seconds
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
</div--> </div-->
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<br/> <br/>
<?merge archivalProfile.type.ifeq('1').not() ?>
<div class="form-group"> <div class="form-group">
<label class="col-md-4 control-label">Allow user indexes</label> <label class="col-md-4 control-label">Allow user indexes</label>
<div class="col-md-8"> <div class="col-md-8">
......
...@@ -51,7 +51,6 @@ file that was distributed with this source code. ...@@ -51,7 +51,6 @@ file that was distributed with this source code.
placeholder="Description"></textarea> placeholder="Description"></textarea>
</div> </div>
</div> </div>
<?merge archivalProfile.type.ifeq('1').not() ?>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">Fileplan level</label> <label class="col-md-3 control-label">Fileplan level</label>
<div class="col-md-9"> <div class="col-md-9">
......
<div class="col-md-9 col-md-offset-1"> <div class="col-md-9 col-md-offset-1">
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs nav-justified" role="tablist" id="archivalProfileNavControl"> <ul class="nav nav-tabs nav-justified" role="tablist" id="archivalProfileNavControl">
<?merge archivalProfile.type.ifeq('1').not() ?>
<li role="presentation" id="descriptionTabBtn"><a href="#descriptionTab" aria-controls="descriptionTab" role="tab" <li role="presentation" id="descriptionTabBtn"><a href="#descriptionTab" aria-controls="descriptionTab" role="tab"
data-toggle="tab">Description</a></li> data-toggle="tab">Description</a></li>
<?merge archivalProfile.type.ifeq('1').not() ?>
<li role="presentation" id="managementTabBtn"><a href="#managementRulesTab" aria-controls="managementRulesTab" <li role="presentation" id="managementTabBtn"><a href="#managementRulesTab" aria-controls="managementRulesTab"
role="tab" data-toggle="tab">Profile rules</a></li> role="tab" data-toggle="tab">Profile rules</a></li>
<?merge archivalProfile.type.ifeq('1').not() ?>
<li role="presentation" id="contentsTabBtn"><a href="#profileContentsTab" aria-controls="profileContentsTab" <li role="presentation" id="contentsTabBtn"><a href="#profileContentsTab" aria-controls="profileContentsTab"
role="tab" data-toggle="tab">Archive structure</a></li> role="tab" data-toggle="tab">Archive structure</a></li>
</ul> </ul>
...@@ -18,7 +15,6 @@ ...@@ -18,7 +15,6 @@
<div role="tabpanel" class="tab-pane fade in" id="descriptionTab"> <div role="tabpanel" class="tab-pane fade in" id="descriptionTab">
<?hinclude recordsManagement/archivalProfile/descriptionTab.html ?> <?hinclude recordsManagement/archivalProfile/descriptionTab.html ?>
</div> </div>
<?merge archivalProfile.type.ifeq('1').not() ?>
<div role="tabpanel" class="tab-pane fade" id="managementRulesTab"> <div role="tabpanel" class="tab-pane fade" id="managementRulesTab">
<?hinclude recordsManagement/archivalProfile/managementRulesTab.html ?> <?hinclude recordsManagement/archivalProfile/managementRulesTab.html ?>
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment