From 91e9f16be6c4d768f77ec668e1c4818faa40ed17 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@fgsys.com>
Date: Fri, 20 Nov 2015 15:18:45 -0200
Subject: [PATCH] fixed typo
---
.../server/functions/settings.coffee | 21 +++++--------------
.../server/startup/settings.coffee | 2 +-
.../startup/settingsOnLoadCdnPrefix.coffee | 2 +-
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/packages/rocketchat-lib/server/functions/settings.coffee b/packages/rocketchat-lib/server/functions/settings.coffee
index 024d3f8af51..18bb2f6548e 100644
--- a/packages/rocketchat-lib/server/functions/settings.coffee
+++ b/packages/rocketchat-lib/server/functions/settings.coffee
@@ -12,6 +12,7 @@ RocketChat.settings.add = (_id, value, options = {}) ->
options.packageValue = value
options.valueSource = 'packageValue'
+ options.ts = new Date
if process?.env?[_id]?
value = process.env[_id]
@@ -30,19 +31,12 @@ RocketChat.settings.add = (_id, value, options = {}) ->
if not options.i18nDescription?
options.i18nDescription = "#{_id}_Description"
- upsertChanges =
+ return RocketChat.models.Settings.upsert { _id: _id },
$set: options
$setOnInsert:
value: value
createdAt: new Date
- if options.persistent is true
- upsertChanges.$unset = { ts: true }
- else
- upsertChanges.$set.ts = new Date
-
- return RocketChat.models.Settings.upsert { _id: _id }, upsertChanges
-
###
# Add a setting group
@@ -60,19 +54,14 @@ RocketChat.settings.addGroup = (_id, options = {}) ->
if not options.i18nDescription?
options.i18nDescription = "#{_id}_Description"
- upsertChanges =
+ options.ts = new Date
+
+ return RocketChat.models.Settings.upsert { _id: _id },
$set: options
$setOnInsert:
type: 'group'
createdAt: new Date
- if options.persistent is true
- upsertChanges.$unset = { ts: true }
- else
- upsertChanges.$set.ts = new Date
-
- return RocketChat.models.Settings.upsert { _id: _id }, upsertChanges
-
###
# Remove a setting by id
diff --git a/packages/rocketchat-lib/server/startup/settings.coffee b/packages/rocketchat-lib/server/startup/settings.coffee
index d9dd9f60896..ffc4406ce92 100644
--- a/packages/rocketchat-lib/server/startup/settings.coffee
+++ b/packages/rocketchat-lib/server/startup/settings.coffee
@@ -121,5 +121,5 @@ Meteor.startup ->
# Remove runtime settings (non-persistent)
Meteor.startup ->
- RocketChat.models.Settings.update({ ts: { $lt: RocketChat.settings.ts } }, { $set: { hidden: true } })
+ RocketChat.models.Settings.update({ ts: { $lt: RocketChat.settings.ts }, persistent: false }, { $set: { hidden: true } })
diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.coffee b/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.coffee
index 259fb10a78b..f8cf5970cb5 100644
--- a/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.coffee
+++ b/packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.coffee
@@ -1,3 +1,3 @@
RocketChat.settings.onload 'CDN_PREFIX', (key, value, initialLoad) ->
if value?.trim() isnt ''
- WebAppInternals.setBundledJsCssPrefix value
+ WebAppInternals?.setBundledJsCssPrefix value
--
GitLab