tstrip
Brightcells
3 ha cambiato i file con 19 aggiunte e 2 eliminazioni
+ 13
- 0
operation/admin.py
@@ -9,6 +9,7 @@ from utils.disk_utils import write_to_disk |
||
| 9 | 9 |
from utils.redis.rapp import set_latest_app |
| 10 | 10 |
from utils.redis.rguest import delete_guest_entrance_control, set_guest_entrance_control |
| 11 | 11 |
from utils.redis.rsettings import del_app_settings_info, set_app_settings_info |
| 12 |
+from utils.strip_utils import tstrip |
|
| 12 | 13 |
|
| 13 | 14 |
|
| 14 | 15 |
class LatestAppInfoAdmin(admin.ModelAdmin): |
@@ -16,6 +17,12 @@ class LatestAppInfoAdmin(admin.ModelAdmin): |
||
| 16 | 17 |
list_filter = ('src', 'status')
|
| 17 | 18 |
|
| 18 | 19 |
def save_model(self, request, obj, form, change): |
| 20 |
+ obj.latest_adr_version_code = tstrip(obj.latest_adr_version_code) |
|
| 21 |
+ obj.latest_adr_version_name = tstrip(obj.latest_adr_version_name) |
|
| 22 |
+ obj.latest_adr_app = tstrip(obj.latest_adr_app) |
|
| 23 |
+ obj.latest_ios_version_code = tstrip(obj.latest_ios_version_code) |
|
| 24 |
+ obj.latest_ios_version_name = tstrip(obj.latest_ios_version_name) |
|
| 25 |
+ obj.latest_ios_url = tstrip(obj.latest_ios_url) |
|
| 19 | 26 |
obj.save() |
| 20 | 27 |
|
| 21 | 28 |
if obj.src == LatestAppInfo.PAIAI_USER: |
@@ -38,6 +45,8 @@ class APPSettingsInfoAdmin(admin.ModelAdmin): |
||
| 38 | 45 |
list_filter = ('platform', 'online', 'status')
|
| 39 | 46 |
|
| 40 | 47 |
def save_model(self, request, obj, form, change): |
| 48 |
+ obj.channel = tstrip(obj.channel) |
|
| 49 |
+ obj.version = tstrip(obj.version) |
|
| 41 | 50 |
obj.save() |
| 42 | 51 |
|
| 43 | 52 |
# 设置 APP 设置信息 |
@@ -64,6 +73,10 @@ class GuestEntranceControlInfoAdmin(admin.ModelAdmin): |
||
| 64 | 73 |
list_display = ('platform', 'min_adr', 'max_adr', 'min_ios', 'max_ios', 'status', 'created_at', 'updated_at')
|
| 65 | 74 |
|
| 66 | 75 |
def save_model(self, request, obj, form, change): |
| 76 |
+ obj.min_adr = tstrip(obj.min_adr) |
|
| 77 |
+ obj.max_adr = tstrip(obj.max_adr) |
|
| 78 |
+ obj.min_ios = tstrip(obj.min_ios) |
|
| 79 |
+ obj.max_ios = tstrip(obj.max_ios) |
|
| 67 | 80 |
obj.save() |
| 68 | 81 |
|
| 69 | 82 |
# 设置游客入口控制 |
+ 1
- 2
utils/redis/rsettings.py
@@ -23,6 +23,5 @@ def del_app_settings_info(appset): |
||
| 23 | 23 |
|
| 24 | 24 |
def get_app_settings_info(platform, channel, version): |
| 25 | 25 |
""" 获取 APP 设置信息 """ |
| 26 |
- if type(platform) != int: |
|
| 27 |
- platform = PlatformMixin.Platforms[platform] |
|
| 26 |
+ platform = platform if isinstance(platform, int) else PlatformMixin.Platforms[platform] |
|
| 28 | 27 |
return json.loads(r.get(APP_SETTINGS_INFO % (platform, channel, version)) or '{}')
|
+ 5
- 0
utils/strip_utils.py
@@ -0,0 +1,5 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+ |
|
| 3 |
+ |
|
| 4 |
+def tstrip(s): |
|
| 5 |
+ return s.strip() if isinstance(s, basestring) else s |