prevents delegation contract against myself

DemocracyEarth · May 24, 2018 · 4de9cbd · 4de9cbd
1 parent 798fc5f
commit 4de9cbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/imports/ui/modules/Vote.js b/imports/ui/modules/Vote.js
@@ -3,7 +3,7 @@ import { Session } from 'meteor/session';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { $ } from 'meteor/jquery';
 
-import { getDelegationContract, createDelegation } from '/imports/startup/both/modules/Contract';
+import { getDelegationContract } from '/imports/startup/both/modules/Contract';
 import { Contracts } from '/imports/api/contracts/Contracts';
 import { convertToSlug } from '/lib/utils';
 import { defaultSettings } from '/lib/const';
@@ -370,15 +370,6 @@ export class Vote {
           settings.title = this.delegationContract.title;
           settings.signatures = this.delegationContract.signatures;
           settings.contractId = this.delegationContract._id;
-        } else {
-          // no delegation
-          /* delegateProfileId = this.targetId;
-          settings.title = `${convertToSlug(Meteor.users.findOne({ _id: this.userId }).username)}-${convertToSlug(Meteor.users.findOne({ _id: this.targetId }).username)}`;
-          settings.signatures = [{ username: Meteor.users.findOne({ _id: this.userId }).username }, { username: Meteor.users.findOne({ _id: this.targetId }).username }];
-          this.delegationContract = createDelegation(this.userId, this.targetId, settings);
-          settings.contractId = this.delegationContract._id;
-          */
-          console.log('trying to create delegation at execution...');
         }
 
         switch (this.arrow) {

diff --git a/lib/views.js b/lib/views.js
@@ -252,7 +252,7 @@ _views.delegationContracts = () => {
 * @return {object} query to use on collection
 */
 _views.bothDelegationContracts = (terms) => {
-  if (Meteor.user()) {
+  if (Meteor.user() && (Meteor.userId() !== terms.delegateId)) {
     const query = { $and: [{ signatures: { $elemMatch: { _id: Meteor.userId() } } }, { signatures: { $elemMatch: { _id: terms.delegateId } } }, { kind: 'DELEGATION' }] };
     const delegations = Contracts.find(query).fetch();
     const delegateName = Meteor.users.findOne({ _id: terms.delegateId }).username;