summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models/org.js10
-rw-r--r--models/orgUser.js12
2 files changed, 11 insertions, 11 deletions
diff --git a/models/org.js b/models/org.js
index 3d41a436..207bfad7 100644
--- a/models/org.js
+++ b/models/org.js
@@ -14,7 +14,7 @@ Org.attachSchema(
// eslint-disable-next-line consistent-return
autoValue() {
if (this.isInsert && !this.isSet) {
- return incrementCounter('counters', 'org_id', 1);
+ return incrementCounter('counters', 'orgId', 1);
}
},
},
@@ -65,9 +65,9 @@ Org.attachSchema(
optional: true,
max: 255,
},
- zip_code: {
+ zipCode: {
/**
- * zip_code of the organization
+ * zipCode of the organization
*/
type: String,
optional: true,
@@ -81,9 +81,9 @@ Org.attachSchema(
optional: true,
max: 255,
},
- billing_email: {
+ billingEmail: {
/**
- * billing_email of the organization
+ * billingEmail of the organization
*/
type: String,
optional: true,
diff --git a/models/orgUser.js b/models/orgUser.js
index 42bd548c..4c699f28 100644
--- a/models/orgUser.js
+++ b/models/orgUser.js
@@ -1,4 +1,4 @@
-OrgUser = new Mongo.Collection('org_user');
+OrgUser = new Mongo.Collection('orgUser');
/**
* A Organization User in wekan
@@ -14,18 +14,18 @@ OrgUser.attachSchema(
// eslint-disable-next-line consistent-return
autoValue() {
if (this.isInsert && !this.isSet) {
- return incrementCounter('counters', 'org_user_id', 1);
+ return incrementCounter('counters', 'orgUserId', 1);
}
},
},
- org_id: {
+ orgId: {
/**
* the organization id
*/
type: Number,
optional: true,
},
- user_id: {
+ userId: {
/**
* the user id
*/
@@ -72,8 +72,8 @@ OrgUser.attachSchema(
if (Meteor.isServer) {
// Index for Organization User.
Meteor.startup(() => {
- OrgUser._collection._ensureIndex({ org_id: -1 });
- OrgUser._collection._ensureIndex({ org_id: -1, user_id: -1 });
+ OrgUser._collection._ensureIndex({ orgId: -1 });
+ OrgUser._collection._ensureIndex({ orgId: -1, userId: -1 });
});
}