Add return urls

agepoly · Jan 5, 2014 · 83567a8 · 83567a8
1 parent 48895a5
commit 83567a8
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 1 deletion.
diff --git a/configs/migrations/0003_auto__add_field_config_url_back_ok__add_field_config_url_back_err.py b/configs/migrations/0003_auto__add_field_config_url_back_ok__add_field_config_url_back_err.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Config.url_back_ok'
+        db.add_column(u'configs_config', 'url_back_ok',
+                      self.gf('django.db.models.fields.URLField')(default='', max_length=200),
+                      keep_default=False)
+
+        # Adding field 'Config.url_back_err'
+        db.add_column(u'configs_config', 'url_back_err',
+                      self.gf('django.db.models.fields.URLField')(default='', max_length=200),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Config.url_back_ok'
+        db.delete_column(u'configs_config', 'url_back_ok')
+
+        # Deleting field 'Config.url_back_err'
+        db.delete_column(u'configs_config', 'url_back_err')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'configs.config': {
+            'Meta': {'object_name': 'Config'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_enable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'allowed_users': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.User']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key_api': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'key_ipn': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'key_request': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'test_mode': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'url_back_err': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'url_back_ok': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'url_ipn': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        u'configs.configlogs': {
+            'Meta': {'object_name': 'ConfigLogs'},
+            'config': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['configs.Config']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'text': ('django.db.models.fields.TextField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'when': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['configs']
diff --git a/configs/models.py b/configs/models.py
@@ -18,6 +18,8 @@ class Config(models.Model):
     test_mode = models.BooleanField(default=True)
 
     url_ipn = models.URLField()
+    url_back_ok = models.URLField()
+    url_back_err = models.URLField()
 
     key_request = models.CharField(max_length=255)
     key_ipn = models.CharField(max_length=255)
@@ -47,7 +49,7 @@ def generate_diff(self, object):
         """Generate diff from this objet an another one (for logs)"""
         retour = '\n\n'
 
-        for (prop, prop_name) in (('name', 'Name'), ('active', 'Active'), ('admin_enable', 'Admin enable'), ('test_mode', 'Test mode'), ('url_ipn', 'URL Ipn')):
+        for (prop, prop_name) in (('name', 'Name'), ('active', 'Active'), ('admin_enable', 'Admin enable'), ('test_mode', 'Test mode'), ('url_ipn', 'URL Ipn'), ('url_back_ok', 'Return URL for success'), ('url_back_err', 'Return URL for error')):
             if not object.pk or getattr(self, prop) != getattr(object, prop):
                 retour += prop_name + '=' + str(getattr(self, prop))
 

diff --git a/configs/templates/configs/configs/show.html b/configs/templates/configs/configs/show.html
@@ -51,6 +51,16 @@ <h3 class="panel-title">{% trans "Details of a config" %}</h3>
                 <p class="form-control-static">{{object.url_ipn}}</p>
               </div>
 
+              <div class="form-group">
+                <label>{% trans "Return URL, if success" %}</label>
+                <p class="form-control-static">{{object.url_back_ok}}</p>
+              </div>
+
+              <div class="form-group">
+                <label>{% trans "Return URL, if error" %}</label>
+                <p class="form-control-static">{{object.url_back_err}}</p>
+              </div>
+
               <div class="form-group">
                 <label>{% trans "Test mode ?" %}</label>
                 <p class="form-control-static"><span class="label label-{{object.test_mode|yesno:"success,danger"}}">{{object.test_mode|yesno}}</span></p>