diff --git a/common.props b/common.props index 96c0d31..0236f16 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 1.0.0-preview.4 + 1.0.0-preview.5 $(NoWarn);CS1591;CS0436 module true diff --git a/src/EasyAbp.ProcessManagement.MongoDB/EasyAbp.ProcessManagement.MongoDB.csproj b/src/EasyAbp.ProcessManagement.MongoDB/EasyAbp.ProcessManagement.MongoDB.csproj index 255ec67..b700024 100644 --- a/src/EasyAbp.ProcessManagement.MongoDB/EasyAbp.ProcessManagement.MongoDB.csproj +++ b/src/EasyAbp.ProcessManagement.MongoDB/EasyAbp.ProcessManagement.MongoDB.csproj @@ -13,8 +13,5 @@ - - - diff --git a/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Notifications/Notification/notificationsModal.js b/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Notifications/Notification/notificationsModal.js index 74bde74..dc98a6d 100644 --- a/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Notifications/Notification/notificationsModal.js +++ b/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Notifications/Notification/notificationsModal.js @@ -4,7 +4,7 @@ $(function () { document.location = abp.appPath + 'ProcessManagement/Processes/Process'; }); - var l = abp.localization.getResource('ProcessManagement'); + var l = abp.localization.getResource('EasyAbpProcessManagement'); var notificationService = easyAbp.processManagement.notifications.notification; var processService = easyAbp.processManagement.processes.process; @@ -21,7 +21,7 @@ $(function () { scrollCollapse: true, ordering: false, ajax: abp.libs.datatables.createAjax(notificationService.getList, { - fromCreationTime: abp.clock.normalize(new Date(abp.clock.now() - notificationLifetime)), + fromCreationTime: new Date(abp.clock.now() - notificationLifetime), userId: abp.currentUser.id, dismissed: false }), diff --git a/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Processes/Process/index.js b/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Processes/Process/index.js index 1849ea4..477bb44 100644 --- a/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Processes/Process/index.js +++ b/src/EasyAbp.ProcessManagement.Web/Pages/ProcessManagement/Processes/Process/index.js @@ -19,7 +19,7 @@ $(function () { return input; }; - var l = abp.localization.getResource('ProcessManagement'); + var l = abp.localization.getResource('EasyAbpProcessManagement'); var service = easyAbp.processManagement.processes.process; var detailsModal = new abp.ModalManager(abp.appPath + 'ProcessManagement/Processes/Process/DetailsModal');