Changeset 4503 for MILK


Ignore:
Timestamp:
27/11/08 15:18:26 (11 years ago)
Author:
cbyrom
Message:

Restrict granule atom to allow only a single upload of a CSML file.

Location:
MILK/trunk/milk_server/milk_server/templates/atom_editor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • MILK/trunk/milk_server/milk_server/templates/atom_editor/atom_editor.html

    r4498 r4503  
    77        <head> 
    88        <title py:content="c.title">title</title> 
    9                 <script type="text/javascript" src="$g.server/js/queueDeployments.js"/> 
     9                <script py:if="not c.atom.isDeployment() and not c.atom.isGranule()" type="text/javascript" src="$g.server/js/queueDeployments.js"/> 
    1010    </head> 
    1111    <body> 
     
    2424 
    2525                <div py:if="not c.atom.isDeployment() and not c.atom.isGranule()" py:replace="GeneralInfo(c.saveLink)"/> 
    26                 <div py:if="c.atom.isGranule()" py:replace="UploadFile('Ingest data from CSML file', 'CSML', c.saveLink)"/> 
     26                <div py:if="c.atom.isGranule() and not c.atom.contentFile" py:replace="UploadFile('Ingest data from CSML file', 'CSML', c.saveLink)"/> 
    2727                <div py:if="not c.atom.isDeployment() and not c.atom.isGranule()" py:replace="TextArea('Summary', c.atom.Summary, c.saveLink)"/> 
    2828                <div py:if="not c.atom.isDeployment() and not c.atom.isGranule()" py:replace="TextArea('Content', c.atom.Content, c.saveLink)"/> 
  • MILK/trunk/milk_server/milk_server/templates/atom_editor/atom_granulator.html

    r4498 r4503  
    1919                            <h2> 
    2020                            <div class="headingblock"> 
    21                                 ${Markup(h.form(h.url(controller='atom_editor/editatom', action='upload', uri = c.uri), multipart=True))} 
     21                                ${Markup(h.form(h.url(controller='atom_editor/editatom', action='upload'), multipart=True))} 
    2222                                <table> 
    2323                                                      <tr> 
Note: See TracChangeset for help on using the changeset viewer.