Changeset 5648

Show
Ignore:
Timestamp:
08/06/12 15:58:35 (7 years ago)
Author:
gpress
Message:

Addresses ticket #1083 NAT acquisition error message.

Location:
seattle/trunk/seattlegeni
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • seattle/trunk/seattlegeni/common/api/maindb.py

    r5611 r5648  
    14671467    
    14681468  if natvesselsqueryset.count() < vesselcount: 
    1469     message = "Requested " + str(vesselcount) + " nat vessels, but we only have " + str(natvesselsqueryset.count()) 
    1470     message += " vessels with port " + str(geniuser.usable_vessel_port) + " available."  
     1469    #COMMENT this out this when NAT acquistion feature is re-enabled  /* ADDED Aug 06, 2012 by GP */ 
     1470    message = 'Acquiring NAT vessels is currently disabled. ' 
     1471    link = """<a href="https://seattle.cs.washington.edu/blog">blog</a>""" 
     1472    message += 'Please check our '+ link  +' to see when we have re-enabled NAT vessels.' 
     1473        #UNCOMMENT this when NAT acquistion feature is re-enabled 
     1474    #message = "Requested " + str(vesselcount) + " nat vessels, but we only have " + str(natvesselsqueryset.count()) 
     1475    #message += " vessels with port " + str(geniuser.usable_vessel_port) + " available."  
    14711476    raise UnableToAcquireResourcesError(message) 
    14721477   
  • seattle/trunk/seattlegeni/website/html/templates/control/myvessels.html

    r5494 r5648  
    5252                           
    5353                          {% ifnotequal action_detail "" %} 
    54                                 <div id="action_summary"> Details: {{ action_detail }} </div> 
     54                                <div id="action_summary"> Details:  {% autoescape off %} {{ action_detail }} {% endautoescape %} </div> 
    5555                          {% endifnotequal %} 
    5656