Merge pull request GeoNode#1 from dialog-it/anzsm

Sheetal's Latest Work
sheetalpgadkari · Oct 13, 2011 · c258e33 · c258e33
2 parents 51ed575 + b05c56b
commit c258e33
Show file tree

Hide file tree

Showing 7 changed files with 1,759 additions and 4 deletions.
diff --git a/src/GeoNodePy/geonode/maps/forms.py b/src/GeoNodePy/geonode/maps/forms.py
@@ -63,5 +63,4 @@ class NewLayerUploadForm(LayerUploadForm):
     abstract = forms.CharField(required=False)
     layer_title = forms.CharField(required=False)
     permissions = JSONField()
-
     spatial_files = ("base_file", "dbf_file", "shx_file", "prj_file", "sld_file")
diff --git a/src/GeoNodePy/geonode/maps/utils.py b/src/GeoNodePy/geonode/maps/utils.py
@@ -397,8 +397,16 @@ def create_store_and_resource(name, data, overwrite):
         from geonode.maps.views import set_layer_permissions
         set_layer_permissions(saved_layer, permissions)
 
-    # Step 12. Verify the layer was saved correctly and clean up if needed
-    logger.info('>>> Step 12. Verifying the layer [%s] was created correctly' % name)
+    # Step 12. Insert the payment options
+    logger.info('>>> Step 12. Setting payment options [%s]', name)
+    payment_options = [n for (n, p) in permissions['payment_options']]
+    if payment_options is not None:
+        from anzsm.payment.utils import setPaymentOptions
+        setPaymentOptions(saved_layer, permissions)    
+
+
+    # Step 13. Verify the layer was saved correctly and clean up if needed
+    logger.info('>>> Step 13. Verifying the layer [%s] was created correctly' % name)
 
     # Verify the object was saved to the Django database
     try:

diff --git a/src/GeoNodePy/geonode/maps/views.py b/src/GeoNodePy/geonode/maps/views.py
@@ -873,6 +873,7 @@ def upload_layer(request):
             try:
                 tempdir, base_file = form.write_files()
                 name, __ = os.path.splitext(form.cleaned_data["base_file"].name)
+
                 saved_layer = save(name, base_file, request.user, 
                         overwrite = False,
                         abstract = form.cleaned_data["abstract"],

diff --git a/src/GeoNodePy/geonode/media/theme/site.css b/src/GeoNodePy/geonode/media/theme/site.css
@@ -745,6 +745,12 @@ cursor: pointer;
     margin: 4px;
 }
 
+.period_item button {
+    width: 16px;
+    height: 16px;
+    margin: 4px;
+}
+
 .x-list-body dl { margin: 0; }
 
 .langbar {

diff --git a/src/GeoNodePy/geonode/templates/maps/layer_upload.html b/src/GeoNodePy/geonode/templates/maps/layer_upload.html
@@ -126,6 +126,9 @@ <h2>{% trans "Add data" %}</h2>
         name: "permissions"
     });
 
+
+
+
     var fp = new Ext.FormPanel({
         renderTo: 'upload_form',
         fileUpload: true,
@@ -146,6 +149,10 @@ <h2>{% trans "Add data" %}</h2>
         buttons: [{
             text: gettext('Upload'),
             handler: function(){
+
+            	var console = window.console;
+            	console.log(permissionsField.getValue());
+
                 if (fp.getForm().isValid()) {
                     fp.getForm().submit({
                         url: form_target,
@@ -206,7 +213,7 @@ <h2>{% trans "Add data" %}</h2>
         userLookup: "{% url geonode.views.ajax_lookup %}",
         listeners: {
             updated: function(pe) {
-                permissionsField.setValue(Ext.util.JSON.encode(pe.writePermissions()));
+                permissionsField.setValue(Ext.util.JSON.encode(pe.writePermissions()));                
             }
         },
         permissions: {

diff --git a/src/GeoNodePy/geonode/templates/maps/search_result_snippet.html b/src/GeoNodePy/geonode/templates/maps/search_result_snippet.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load geonode_auth %}
+
 
 <p><b>{% trans "Abstract:" %}</b>
 {% if rec.identification.abstract %}
@@ -70,5 +71,7 @@
     {% endif %}
   {% else %}
     <p>{% trans "You do not have permission to view or download this layer" %}</p>
+    <p><a href="layer/payment/{{layer.id}}"> Buy </a></p>
+
   {% endif %}
 {% endif %}