From ff08e7261cfd9ae22015dc3092c32125dd114d29 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Fri, 8 Apr 2022 14:53:25 +0800 Subject: [PATCH 1/2] * Adjust for license. --- .../ext/view/batchcreate.lite.html.hook.php | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 extension/lite/user/ext/view/batchcreate.lite.html.hook.php diff --git a/extension/lite/user/ext/view/batchcreate.lite.html.hook.php b/extension/lite/user/ext/view/batchcreate.lite.html.hook.php new file mode 100644 index 0000000000..e18f1365c1 --- /dev/null +++ b/extension/lite/user/ext/view/batchcreate.lite.html.hook.php @@ -0,0 +1,70 @@ + +dao->select("COUNT('*') as count")->from(TABLE_USER) + ->where('deleted')->eq(0) + ->beginIF($this->config->edition != 'open')->andWhere("visions")->ne('lite')->fi() + ->fetch('count'); +js::set('userCount', $userCount); +js::set('userMaxCount', $userMaxCount); +js::set('noticeUserCreate', str_replace('%maxcount%', $userMaxCount, $lang->user->noticeUserCreate)); + +if($this->config->edition != 'open') +{ + $liteCount = $this->dao->select("COUNT('*') as count")->from(TABLE_USER)->where('deleted')->eq(0)->andWhere("visions")->eq('lite')->fetch('count'); + $liteMaxCount = $properties['lite']['value']; + js::set('liteCount', $liteCount); + js::set('liteMaxCount', $liteMaxCount); + js::set('noticeFeedbackCreate', str_replace('%maxcount%', $liteMaxCount, $lang->user->noticeFeedbackCreate)); +} +?> + + From 77aab6fcbf31cfad6a216d49d544a945fed0b4bd Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Mon, 11 Apr 2022 11:00:38 +0800 Subject: [PATCH 2/2] * Fix bug . --- extension/lite/user/ext/lang/zh-cn/lite.php | 1 + extension/lite/user/ext/view/batchcreate.lite.html.hook.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extension/lite/user/ext/lang/zh-cn/lite.php b/extension/lite/user/ext/lang/zh-cn/lite.php index d2f5818794..1617abafa0 100644 --- a/extension/lite/user/ext/lang/zh-cn/lite.php +++ b/extension/lite/user/ext/lang/zh-cn/lite.php @@ -1,2 +1,3 @@ user->task = '任务'; +$lang->user->noticeFeedbackUserLimit = "迅捷企业版用户数已经达到授权的上限,不能继续添加用户!"; diff --git a/extension/lite/user/ext/view/batchcreate.lite.html.hook.php b/extension/lite/user/ext/view/batchcreate.lite.html.hook.php index e18f1365c1..59dcd3daa2 100644 --- a/extension/lite/user/ext/view/batchcreate.lite.html.hook.php +++ b/extension/lite/user/ext/view/batchcreate.lite.html.hook.php @@ -37,7 +37,9 @@ $(function() if($.inArray("ditto", visions) == '-1') lastVision = visions; visions = lastVision; - + + if(visions == undefined) visions = ['lite']; + var index = $.inArray('lite', visions); if(index != '-1' && visions.length == '1') @@ -51,8 +53,6 @@ $(function() } }); - console.log(allLiteCount); - console.log(liteMaxCount); if(allUserCount > userMaxCount) { alert(noticeUserCreate.replace('%usercount%', allUserCount));