github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-26 13:25:10 +00:00
Code Issues Projects Releases Wiki Activity

[Change] 全部使用uuid作为主键

Browse Source
This commit is contained in:
ibuler
2017-11-23 14:08:01 +08:00
parent d80cbe270a
commit e7f38ec894
21 changed files with 102 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ops/models.py
View File

@@ -1,9 +1,9 @@
# ~*~ coding: utf-8 ~*~
from __future__ import unicode_literals, absolute_import
import logging
from collections import OrderedDict
import json
import uuid
from django.db import models
from django.utils.translation import ugettext_lazy as _
@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)
class Task(models.Model):
uuid = models.CharField(max_length=128, verbose_name=_('UUID'), primary_key=True)
uuid = models.UUIDField(default=uuid.uuid4, primary_key=True)
name = models.CharField(max_length=128, blank=True, verbose_name=_('Name'))
date_start = models.DateTimeField(auto_now_add=True, verbose_name=_('Start time'))
date_finished = models.DateTimeField(blank=True, null=True, verbose_name=_('End time'))

4
apps/ops/urls/view_urls.py
View File

@@ -10,6 +10,6 @@ __all__ = ["urlpatterns"]
urlpatterns = [
# TResource Task url
url(r'^task/$', views.TaskListView.as_view(), name='task-list'),
url(r'^task/(?P<pk>[0-9a-zA-Z-]+)/$', views.TaskDetailView.as_view(), name='task-detail'),
url(r'^task/(?P<pk>[0-9a-zA-Z-]+)/run/$', views.TaskRunView.as_view(), name='task-run'),
url(r'^task/(?P<pk>[0-9a-zA-Z\-]+)/$', views.TaskDetailView.as_view(), name='task-detail'),
url(r'^task/(?P<pk>[0-9a-zA-Z\-]+)/run/$', views.TaskRunView.as_view(), name='task-run'),
]