Ignore:
Timestamp:
Nov 19, 2010, 11:51:09 AM (12 years ago)
Author:
robert@…
Message:

The templateeditor is now capable of adding new items to a stringlist (that is in use), or adding new ontologies to a ontologyterm field that is in use. See ticket #74

Location:
trunk/grails-app/views/templateEditor/elements
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/views/templateEditor/elements/_disabledFieldForm.gsp

    r959 r1175  
     1        <g:hiddenField name="id" value="${templateField?.id}" />
     2        <g:hiddenField name="version" value="${templateField?.version}" />
     3        <g:hiddenField name="is_disabled" value="1" />
     4        <g:if test="${is_selected}"><g:hiddenField name="renderTemplate" value="selected" /></g:if>
     5        <g:if test="${template}"><g:hiddenField name="templateId" value="${template.id}" /></g:if>
     6
    17        <label for="name">Name:</label> <g:textField disabled="disabled" name="name" value="${templateField?.name}" /><br />
    28        <label for="type">Type:</label> <g:textField disabled="disabled" name="type" value="${templateField?.type}" /><br />
    39
    410        <div class="extra stringlist_options" <g:if test="${templateField?.type.toString() == 'STRINGLIST'}">style='display: block;'</g:if>>
    5           <label for="type">Items:</label>
    6                 <g:textArea name="listEntries" disabled="disabled" value="${templateField?.listEntries?.name?.join( '\n' )}" />
     11          <label for="type">Used items:</label>
     12                <g:textArea name="usedListEntries" disabled="disabled" value="${templateField?.getUsedListEntries().name?.join( '\n' )}" />
     13          <label for="type">Extra Items (every item on a new line):</label>
     14                <g:textArea name="listEntries" value="${templateField?.getNonUsedListEntries().name?.join( '\n' )}" />
    715        </div>
    816        <div class="extra ontologyterm_options" <g:if test="${templateField?.type.toString() == 'ONTOLOGYTERM'}">style='display: block;'</g:if>>
    9           <label for="type">Ontology:</label> <g:textArea name="ontology" disabled="disabled" value="${templateField?.ontologies?.name?.join( '\n' )}" /><br />
     17          <label for="type">Used ontologies:</label> <g:textArea name="ontology" disabled="disabled" value="${templateField?.getUsedOntologies().name?.join( '\n' )}" /><br />
     18
     19          <label for="type">Extra ontologies:<br /><br /><a href="#" style="text-decoration: underline;" onClick="openOntologyDialog();">Add new</a></label>
     20                <g:select multiple="yes" size="5" from="${ontologies - templateField?.getUsedOntologies()}" class="ontologySelect" optionValue="name" optionKey="id" name="ontologies" id="ontologies_${templateField?.id}" value="${templateField?.getNonUsedOntologies()}" /><br />
     21
    1022        </div>
    1123       
    … …  
    1325        <label for="comment">Comment:</label> <g:textArea disabled="disabled" name="comment" value="${templateField?.comment}" /><br />
    1426        <label for="required">Required:</label> <input type="checkbox" disabled <g:if test="${templateField?.required}">checked</g:if><br />
     27
     28        <div class="templateFieldButtons">
     29          <g:if test="${ templateField?.type.toString() == 'STRINGLIST' || templateField?.type.toString() == 'ONTOLOGYTERM' }">
     30                <input type="button" value="Save" onClick="updateTemplateField( ${templateField?.id} );">
     31                <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField?.id} );">
     32          </g:if>
     33          <g:else>
     34                <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField?.id} );">
     35          </g:else>
     36        </div>

  • trunk/grails-app/views/templateEditor/elements/_fieldForm.gsp

    r1056 r1175  
    1         <label for="name">Name:</label> <g:textField name="name" value="${templateField?.name}" /><br />
     1  <g:hiddenField name="id" value="${templateField?.id}" />
     2  <g:hiddenField name="version" value="${templateField?.version}" />
     3  <g:if test="${is_new}"><g:hiddenField name="entity" value="${encryptedEntity}" /></g:if>
     4  <g:if test="${is_selected}"><g:hiddenField name="renderTemplate" value="selected" /></g:if>
     5  <g:if test="${template}"><g:hiddenField name="templateId" value="${template.id}" /></g:if>
     6<label for="name">Name:</label> <g:textField name="name" value="${templateField?.name}" /><br />
    27        <label for="type">Type:</label>
    38          <%
    … …  
    3742        <label for="comment">Comment:</label> <g:textArea name="comment" value="${templateField?.comment}" /><br />
    3843        <label for="required">Required:</label> <g:checkBox name="required" value="${templateField?.required}" /><br />
     44
     45        <div class="templateFieldButtons">
     46          <g:if test="${is_new}">
     47                <input type="button" value="Save" onClick="createTemplateField( 'new' );">
     48                <input type="button" value="Cancel" onClick="hideTemplateFieldForm( 'new' );">
     49          </g:if>
     50          <g:else>
     51                <input type="button" value="Save" onClick="updateTemplateField( ${templateField?.id} );">
     52                <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField?.id} );">
     53          </g:else>
     54        </div>

  • trunk/grails-app/views/templateEditor/elements/_liFieldInUse.gsp

    r1159 r1175  
    1010   
    1111<form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">
    12         <g:hiddenField name="id" value="${templateField.id}" />
    13         <g:hiddenField name="version" value="${templateField.version}" />
    14         <p class="noEditsPossible">Editing not possible. Field is used in ${numUses} template(s).</p>
    15         <g:render template="elements/disabledFieldForm" model="['templateField': templateField, 'ontologies': ontologies, 'fieldTypes': fieldTypes]"/>
    16         <div class="templateFieldButtons">
    17                 <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField.id} );">
    18         </div>
     12  <g:if test="${ templateField?.type.toString() == 'STRINGLIST' }">
     13    <p class="noEditsPossible">You can only add or remove list items that are not used. Field is used in ${numUses} template(s).</p>
     14  </g:if>
     15  <g:else>
     16    <g:if test="${templateField?.type.toString() == 'ONTOLOGYTERM' }">
     17    <p class="noEditsPossible">You can only add or remove ontologies that are not used. Field is used in ${numUses} template(s).</p>
     18        </g:if>
     19        <g:else>
     20          <p class="noEditsPossible">Editing not possible. Field is used in ${numUses} template(s).</p>
     21        </g:else>
     22  </g:else>
     23  <g:render template="elements/disabledFieldForm" model="['templateField': templateField, 'ontologies': ontologies, 'fieldTypes': fieldTypes]"/>
    1924</form>
    2025

  • trunk/grails-app/views/templateEditor/elements/_liFieldNotInUse.gsp

    r1159 r1175  
    99
    1010<form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">
    11         <g:hiddenField name="id" value="${templateField.id}" />
    12         <g:hiddenField name="version" value="${templateField.version}" />
    1311        <g:render template="elements/fieldForm" model="['templateField': templateField, 'ontologies': ontologies, 'fieldTypes': fieldTypes]"/>
    14         <div class="templateFieldButtons">
    15                 <input type="button" value="Save" onClick="updateTemplateField( ${templateField.id} );">
    16                 <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField.id} );">
    17         </div>
    1812</form>

  • trunk/grails-app/views/templateEditor/elements/_liFieldSelected.gsp

    r1159 r1175  
    1515  <form class="templateField_form" id="templateField_${templateField.id}_form" action="updateField">
    1616          <g:if test="${templateField.isEditable()}">
    17                 <g:hiddenField name="id" value="${templateField.id}" />
    18                 <g:hiddenField name="version" value="${templateField.version}" />
    19                 <g:hiddenField name="renderTemplate" value="selected" />
    20                 <g:hiddenField name="templateId" value="${template.id}" />
    21                 <g:render template="elements/fieldForm" model="['templateField': templateField, 'ontologies': ontologies, 'fieldTypes': fieldTypes]"/>
    22                 <div class="templateFieldButtons">
    23                         <input type="button" value="Save" onClick="updateTemplateField( ${templateField.id} );">
    24                         <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField.id} );">
    25                 </div>
     17                <g:render template="elements/fieldForm" model="['templateField': templateField, 'template': template, 'is_selected': true, 'ontologies': ontologies, 'fieldTypes': fieldTypes]" />
    2618          </g:if>
    2719        <g:else>
    28                 <g:render template="elements/disabledFieldForm" model="['templateField': templateField, 'ontologies': ontologies, 'fieldTypes': fieldTypes]"/>
    29                 <div class="templateFieldButtons">
    30                         <input type="button" value="Close" onClick="hideTemplateFieldForm( ${templateField.id} );">
    31                 </div>
     20                <g:render template="elements/disabledFieldForm" model="['templateField': templateField, 'template': template, 'is_selected': true, 'ontologies': ontologies, 'fieldTypes': fieldTypes]"/>
    3221        </g:else>
    3322  </form>
Note: See TracChangeset for help on using the changeset viewer.