show all fields in repository form. #294

datacite · Feb 7, 2020 · f6f6d85 · f6f6d85
1 parent 9c0d8f1
commit f6f6d85
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git a/app/templates/providers/show/repositories/new.hbs b/app/templates/providers/show/repositories/new.hbs
@@ -63,10 +63,9 @@
             {{#each model.repository.language as |language index|}}
               <RepositoryLanguage @model={{model.repository}} @language={{language}} @form={{form}} @index={{index}} />
             {{/each}}
-
-            {{#if (lte model.repository.language.length 2)}}
-              <BsButton @class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguage"}}>{{fa-icon "plus-circle"}} Add another Language</BsButton>
-            {{/if}}
+          {{/if}}
+          {{#if (lte model.repository.language.length 2)}}
+            <BsButton @class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguage"}}>{{fa-icon "plus-circle"}} Add Language</BsButton>
           {{/if}}
         </div>
       </div>
@@ -86,10 +85,9 @@
               {{#each model.repository.repositoryType as |repositoryType index|}}
                 <RepositoryRepositoryType @model={{model.repository}} @repositoryType={{repositoryType}} @form={{form}} @index={{index}} />
               {{/each}}
-
-              {{#if (lte model.repository.repositoryType.length 2)}}
-                <BsButton @class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryType"}}>{{fa-icon "plus-circle"}} Add another Repository Type</BsButton>
-              {{/if}}
+            {{/if}}
+            {{#if (lte model.repository.repositoryType.length 2)}}
+              <BsButton @class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryType"}}>{{fa-icon "plus-circle"}} Add Repository Type</BsButton>
             {{/if}}
           </div>
         </div>
@@ -101,10 +99,9 @@
               {{#each model.repository.certificate as |certificate index|}}
                 <RepositoryCertificate @model={{model.repository}} @certificate={{certificate}} @form={{form}} @index={{index}} />
               {{/each}}
-
-              {{#if (lte model.repository.certificate.length 2)}}
-                <BsButton @class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificate"}}>{{fa-icon "plus-circle"}} Add another Certificate</BsButton>
-              {{/if}}
+            {{/if}}
+            {{#if (lte model.repository.certificate.length 2)}}
+              <BsButton @class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificate"}}>{{fa-icon "plus-circle"}} Add Certificate</BsButton>
             {{/if}}
           </div>
         </div>

diff --git a/app/templates/repositories/show/edit.hbs b/app/templates/repositories/show/edit.hbs
@@ -63,10 +63,9 @@
             {{#each model.language as |language index|}}
               <RepositoryLanguage @model={{model}} @language={{language}} @form={{form}} @index={{index}} />
             {{/each}}
-
-            {{#if (lte model.language.length 2)}}
-              <BsButton @class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguage"}}>{{fa-icon "plus-circle"}} Add another Language</BsButton>
-            {{/if}}
+          {{/if}}
+          {{#if (lte model.language.length 2)}}
+            <BsButton @class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguage"}}>{{fa-icon "plus-circle"}} Add Language</BsButton>
           {{/if}}
         </div>
       </div>
@@ -79,17 +78,16 @@
       <form.element @controlType="textarea" @id="domains" @label="Domains" @property="domains" @required={{false}} @helpText="List of (sub-)domains used for DOI registration, or use * to allow all domains" />
 
       {{#if (eq model.clientType "repository")}}
-        <div class="form-group">
+        <div class="form-group" id="repository-type">
           <label class="control-label col-md-3">Repository Type (optional)</label>
           <div class="col-md-9">
             {{#if (gt model.repositoryType.length 0)}}
               {{#each model.repositoryType as |repositoryType index|}}
                 <RepositoryRepositoryType @model={{model}} @repositoryType={{repositoryType}} @form={{form}} @index={{index}} />
               {{/each}}
-
-              {{#if (lte model.repositoryType.length 2)}}
-                <BsButton @class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryType"}}>{{fa-icon "plus-circle"}} Add another Repository Type</BsButton>
-              {{/if}}
+            {{/if}}
+            {{#if (lte model.repositoryType.length 2)}}
+              <BsButton @class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryType"}}>{{fa-icon "plus-circle"}} Add Repository Type</BsButton>
             {{/if}}
           </div>
         </div>
@@ -101,10 +99,9 @@
               {{#each model.certificate as |certificate index|}}
                 <RepositoryCertificate @model={{model}} @certificate={{certificate}} @form={{form}} @index={{index}} />
               {{/each}}
-
-              {{#if (lte model.certificate.length 2)}}
-                <BsButton @class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificate"}}>{{fa-icon "plus-circle"}} Add another Certificate</BsButton>
-              {{/if}}
+            {{/if}}
+            {{#if (lte model.certificate.length 2)}}
+              <BsButton @class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificate"}}>{{fa-icon "plus-circle"}} Add Certificate</BsButton>
             {{/if}}
           </div>
         </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bracco",
-  "version": "3.3.14",
+  "version": "3.3.18",
   "private": true,
   "description": "Fabrica",
   "repository": {

diff --git a/tests/acceptance/staff_admin/repository-test.js b/tests/acceptance/staff_admin/repository-test.js
@@ -118,7 +118,7 @@ module('Acceptance | staff_admin | repository', function(hooks) {
   });
 
   test('editing repository AWI form', async function(assert) {
-    assert.expect(21);
+    assert.expect(23);
 
     await visit('/repositories/tib.awi/edit');
 
@@ -143,6 +143,8 @@ module('Acceptance | staff_admin | repository', function(hooks) {
     assert.dom('input#url-field').exists();
     assert.dom('div#language').exists();
     assert.dom('div#software').exists();
+    assert.dom('div#repository-type').exists();
+    assert.dom('div#certificate').exists();
     assert.dom('textarea#domains-field').exists();
     assert.dom('input#is-active-field').exists();