kallithea Changeset - 42976e0d4e2f

Changeset - 42976e0d4e2f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-07-28 16:28:34
madski@unity3d.com

db: make repo creation state constants unicode - avoid conversion in sqlalchemy

2 files changed with 5 insertions and 5 deletions:

kallithea/model/db.py

kallithea/templates/data_table/_dt_elements.html

0 comments (0 inline, 0 general)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -966,15 +966,15 @@ class Repository(Base, BaseModel): @@
         _table_args_default_dict,
+    )
     DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
     DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
     STATE_CREATED = 'repo_state_created'
     STATE_PENDING = 'repo_state_pending'
     STATE_ERROR = 'repo_state_error'
     STATE_CREATED = u'repo_state_created'
     STATE_PENDING = u'repo_state_pending'
     STATE_ERROR = u'repo_state_error'
     repo_id = Column(Integer(), primary_key=True)
     repo_name = Column(Unicode(255), nullable=False, unique=True)
     repo_state = Column(String(255), nullable=False)
     clone_uri = Column(String(255), nullable=True) # FIXME: not nullable?

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -132,15 +132,15 @@ @@
     </div>
   </div>
 </%def>
 <%def name="repo_state(repo_state)">
   <div>
     %if repo_state == 'repo_state_pending':
+    %if repo_state == u'repo_state_pending':
         <div class="btn btn-mini btn-info disabled">${_('Creating')}</div>
     %elif repo_state == 'repo_state_created':
+    %elif repo_state == u'repo_state_created':
         <div class="btn btn-mini btn-success disabled">${_('Created')}</div>
     %else:
         <div class="btn btn-mini btn-danger disabled" title="${repo_state}">invalid</div>
     %endif
   </div>
 </%def>

0 comments (0 inline, 0 general)