Download as
Browse Code »

Commit 17785222188a8eea202d02036390b8214fd559f3

Authored by Luan
1 parent c6086633
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Minor fixes and changes on attachments

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
src/proxy/migrations/0003_create_attachment_view.py
  Diff comments   View file @1778522
@@ -15,7 +15,7 @@ class Migration(DataMigration): @@ -15,7 +15,7 @@ class Migration(DataMigration):
15 cursor.execute(''' 15 cursor.execute('''
16 CREATE OR REPLACE VIEW attachment_view AS SELECT 16 CREATE OR REPLACE VIEW attachment_view AS SELECT
17 CONCAT(attachment.type, '/' , attachment.id, '/', attachment.filename) AS url, 17 CONCAT(attachment.type, '/' , attachment.id, '/', attachment.filename) AS url,
18 - attachment.type AS type, 18 + attachment.type AS used_by,
19 attachment.filename as filename, 19 attachment.filename as filename,
20 (SELECT LOWER(SUBSTRING(attachment.filename FROM '\w{2,3}$'))) AS mimetype, 20 (SELECT LOWER(SUBSTRING(attachment.filename FROM '\w{2,3}$'))) AS mimetype,
21 attachment.author as author, 21 attachment.author as author,
@@ -29,7 +29,7 @@ class Migration(DataMigration): @@ -29,7 +29,7 @@ class Migration(DataMigration):
29 connection = connections['trac'] 29 connection = connections['trac']
30 30
31 cursor = connection.cursor() 31 cursor = connection.cursor()
32 - cursor.execute('DROP VIEW attachment_view;') 32 + cursor.execute('DROP VIEW IF EXISTS attachment_view;')
33 33
34 models = { 34 models = {
35 u'proxy.attachment': { 35 u'proxy.attachment': {
src/proxy/models.py
  Diff comments   View file @1778522
@@ -8,7 +8,7 @@ from hitcount.models import HitCountModelMixin @@ -8,7 +8,7 @@ from hitcount.models import HitCountModelMixin
8 8
9 class Attachment(models.Model, HitCountModelMixin): 9 class Attachment(models.Model, HitCountModelMixin):
10 url = models.TextField(primary_key=True) 10 url = models.TextField(primary_key=True)
11 - type = models.TextField() 11 + used_by = models.TextField()
12 filename = models.TextField() 12 filename = models.TextField()
13 author = models.TextField(blank=True) 13 author = models.TextField(blank=True)
14 description = models.TextField(blank=True) 14 description = models.TextField(blank=True)