diff --git a/djangoproject/core/migrations/0048_auto__add_field_project_description.py b/djangoproject/core/migrations/0048_auto__add_field_project_description.py
new file mode 100644
index 00000000..264ccad9
--- /dev/null
+++ b/djangoproject/core/migrations/0048_auto__add_field_project_description.py
@@ -0,0 +1,273 @@
+# -*- 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 'Project.description'
+ db.add_column('core_project', 'description',
+ self.gf('django.db.models.fields.TextField')(null=True, blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'Project.description'
+ db.delete_column('core_project', 'description')
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ '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': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'bitcoin_frespo.moneysent': {
+ 'Meta': {'object_name': 'MoneySent'},
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'from_address': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'lastChangeDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'to_address': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'transaction_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
+ 'value': ('django.db.models.fields.DecimalField', [], {'max_digits': '16', 'decimal_places': '8'})
+ },
+ 'bitcoin_frespo.receiveaddress': {
+ 'Meta': {'object_name': 'ReceiveAddress'},
+ 'address': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ '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'}),
+ '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'})
+ },
+ 'core.actionlog': {
+ 'Meta': {'object_name': 'ActionLog'},
+ 'action': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'entity': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'issue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Issue']", 'null': 'True'}),
+ 'issue_comment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.IssueComment']", 'null': 'True'}),
+ 'new_json': ('django.db.models.fields.TextField', [], {}),
+ 'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Offer']", 'null': 'True'}),
+ 'old_json': ('django.db.models.fields.TextField', [], {}),
+ 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Project']", 'null': 'True'}),
+ 'solution': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Solution']", 'null': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
+ },
+ 'core.issue': {
+ 'Meta': {'object_name': 'Issue'},
+ 'createdByUser': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_feedback': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_public_suggestion': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'key': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Project']", 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '400'}),
+ 'trackerURL': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'trackerURL_noprotocol': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'updatedDate': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'core.issuecomment': {
+ 'Meta': {'object_name': 'IssueComment'},
+ 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'content': ('django.db.models.fields.TextField', [], {}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'issue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Issue']"})
+ },
+ 'core.issuecommenthistevent': {
+ 'Meta': {'object_name': 'IssueCommentHistEvent'},
+ 'comment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.IssueComment']"}),
+ 'content': ('django.db.models.fields.TextField', [], {}),
+ 'event': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'eventDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'core.issuewatch': {
+ 'Meta': {'object_name': 'IssueWatch'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'issue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Issue']"}),
+ 'reason': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'core.offer': {
+ 'Meta': {'object_name': 'Offer'},
+ 'acceptanceCriteria': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'currency': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+ 'expirationDate': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'issue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Issue']"}),
+ 'lastChangeDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'no_forking': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '9', 'decimal_places': '2'}),
+ 'require_release': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'sponsor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+ },
+ 'core.offercomment': {
+ 'Meta': {'object_name': 'OfferComment'},
+ 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'content': ('django.db.models.fields.TextField', [], {}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Offer']"})
+ },
+ 'core.offercommenthistevent': {
+ 'Meta': {'object_name': 'OfferCommentHistEvent'},
+ 'comment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.OfferComment']"}),
+ 'content': ('django.db.models.fields.TextField', [], {}),
+ 'event': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'eventDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'core.offerhistevent': {
+ 'Meta': {'object_name': 'OfferHistEvent'},
+ 'acceptanceCriteria': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'event': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'eventDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'expirationDate': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'no_forking': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Offer']"}),
+ 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '9', 'decimal_places': '2'}),
+ 'require_release': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+ },
+ 'core.offerwatch': {
+ 'Meta': {'object_name': 'OfferWatch'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Offer']"}),
+ 'reason': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'core.payment': {
+ 'Meta': {'object_name': 'Payment'},
+ 'bitcoin_fee': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '8'}),
+ 'bitcoin_receive_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bitcoin_frespo.ReceiveAddress']", 'null': 'True'}),
+ 'bitcoin_transaction_hash': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
+ 'confirm_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'currency': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+ 'fee': ('django.db.models.fields.DecimalField', [], {'max_digits': '16', 'decimal_places': '8'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'lastChangeDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Offer']"}),
+ 'offer2payment_suggested_rate': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '8'}),
+ 'offer_currency': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True'}),
+ 'paykey': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'total': ('django.db.models.fields.DecimalField', [], {'max_digits': '16', 'decimal_places': '8'}),
+ 'total_bitcoin_received': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '8'}),
+ 'usd2payment_rate': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '8'})
+ },
+ 'core.paymenthistevent': {
+ 'Meta': {'object_name': 'PaymentHistEvent'},
+ 'event': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'eventDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'payment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Payment']"}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+ },
+ 'core.paymentpart': {
+ 'Meta': {'object_name': 'PaymentPart'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'money_sent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bitcoin_frespo.MoneySent']", 'null': 'True'}),
+ 'payment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Payment']"}),
+ 'paypalEmail': ('django.db.models.fields.EmailField', [], {'max_length': '256', 'null': 'True'}),
+ 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '16', 'decimal_places': '8'}),
+ 'programmer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'solution': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Solution']"})
+ },
+ 'core.project': {
+ 'Meta': {'object_name': 'Project'},
+ 'createdByUser': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'homeURL': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image3x1': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'trackerURL': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.solution': {
+ 'Meta': {'object_name': 'Solution'},
+ 'accepting_payments': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'creationDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'issue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Issue']"}),
+ 'lastChangeDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'programmer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+ },
+ 'core.solutionhistevent': {
+ 'Meta': {'object_name': 'SolutionHistEvent'},
+ 'event': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'eventDate': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'solution': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Solution']"}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+ },
+ 'core.userinfo': {
+ 'Meta': {'object_name': 'UserInfo'},
+ 'about': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'bitcoin_receive_address': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+ 'brazilianPaypal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'hide_from_userlist': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_paypal_email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_primary_email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'paypalEmail': ('django.db.models.fields.EmailField', [], {'max_length': '256'}),
+ 'paypal_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'preferred_language_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+ 'realName': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+ 'receiveAllEmail': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'receiveEmail_announcements': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'receiveEmail_issue_comments': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'receiveEmail_issue_offer': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'receiveEmail_issue_payment': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'receiveEmail_issue_work': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'screenName': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'website': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['core']
\ No newline at end of file
diff --git a/djangoproject/core/models.py b/djangoproject/core/models.py
index 462552b3..603f28f2 100644
--- a/djangoproject/core/models.py
+++ b/djangoproject/core/models.py
@@ -236,6 +236,7 @@ def f(project, filename):
return '%s_%s_%s.%s' % (name, project.id, timestamp, extension)
return f
+
# Tudo que estah marcado como "@Auditable" eh um lembrete que pode ter algum atributo que eh alterado pelo
# usuário depois que a entidade eh criada.
# Essas alteracoes precisam ser gravadas em tabelas auxiliares (que a gente cria depois)
@@ -246,6 +247,7 @@ def f(project, filename):
#@Auditable
class Project(models.Model):
name = models.CharField(max_length=200)
+ description = models.TextField(null=True, blank=True)
createdByUser = models.ForeignKey(User)
creationDate = models.DateTimeField()
homeURL = models.URLField(null=True, blank=True)
diff --git a/djangoproject/core/views/project_views.py b/djangoproject/core/views/project_views.py
index baef2bf8..582590aa 100644
--- a/djangoproject/core/views/project_views.py
+++ b/djangoproject/core/views/project_views.py
@@ -27,7 +27,8 @@ def edit(request):
project = Project.objects.get(pk=project_id)
if 'image3x1' in request.FILES and request.FILES['image3x1']:
project.image3x1 = request.FILES['image3x1']
- project.save()
+ project.description = request.POST.get('description')
+ project.save()
return redirect('core.views.project_views.view', project_id=project.id)
diff --git a/djangoproject/templates/core2/project.html b/djangoproject/templates/core2/project.html
index fbe94547..984f25c0 100644
--- a/djangoproject/templates/core2/project.html
+++ b/djangoproject/templates/core2/project.html
@@ -68,7 +68,7 @@ {{ project.name }}
diff --git a/djangoproject/templates/core2/project_edit.html b/djangoproject/templates/core2/project_edit.html
index d98a2520..c38e413f 100644
--- a/djangoproject/templates/core2/project_edit.html
+++ b/djangoproject/templates/core2/project_edit.html
@@ -14,7 +14,7 @@ Editing project: {{ project.name }}
-
+