diff --git a/app/components/add-contribution/component.js b/app/components/add-contribution/component.js index b9533f8..19247a8 100644 --- a/app/components/add-contribution/component.js +++ b/app/components/add-contribution/component.js @@ -1,7 +1,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import { and, notEmpty } from '@ember/object/computed'; -import { isEmpty } from '@ember/utils'; +import { assign } from '@ember/polyfills'; import moment from 'moment'; export default Component.extend({ @@ -24,19 +24,17 @@ export default Component.extend({ init () { this._super(...arguments); this.set('defaultDate', moment().startOf('hour').toDate()); + this.set('defaultAttr', { + contributorId: null, + kind: null, + date: this.defaultDate, + amount: null, + description: null, + url: null, + details: null + }); - // Default attributes used by reset - if (isEmpty(this.attributes)) { - this.set('attributes', { - contributorId: null, - kind: null, - date: this.defaultDate, - amount: null, - description: null, - url: null, - details: null - }); - } + this.set('attributes', assign({}, this.defaultAttr, this.attributes)); this.reset(); }, diff --git a/app/controllers/contributions/new.js b/app/controllers/contributions/new.js index 75e00c6..0cab1b8 100644 --- a/app/controllers/contributions/new.js +++ b/app/controllers/contributions/new.js @@ -6,6 +6,8 @@ export default Controller.extend({ kredits: service(), + queryParams: ['contributorId', 'kind', 'amount'], + contributors: alias('kredits.contributors'), minedContributors: filterBy('contributors', 'id'), diff --git a/app/router.js b/app/router.js index 014dbc8..71b14b2 100644 --- a/app/router.js +++ b/app/router.js @@ -20,7 +20,7 @@ Router.map(function() { this.route('new'); }); this.route('contributions', function() { - this.route('new'); + this.route('new', { queryParams: ['contributorId', 'kind', 'amount'] }); this.route('resubmit', { path: ':id/resubmit' }); }); this.route('contributors', function() { diff --git a/app/routes/contributions/new.js b/app/routes/contributions/new.js new file mode 100644 index 0000000..7d760ab --- /dev/null +++ b/app/routes/contributions/new.js @@ -0,0 +1,9 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ + + model (params) { + return { params }; + } + +}); diff --git a/app/styles/components/_contributor-profile.scss b/app/styles/components/_contributor-profile.scss index b911efe..73ed08d 100644 --- a/app/styles/components/_contributor-profile.scss +++ b/app/styles/components/_contributor-profile.scss @@ -42,6 +42,10 @@ section#contributor-profile { } } } + + .actions { + margin-top: 2rem; + } } .actions { diff --git a/app/templates/contributions/new.hbs b/app/templates/contributions/new.hbs index c7b5ffb..5682115 100644 --- a/app/templates/contributions/new.hbs +++ b/app/templates/contributions/new.hbs @@ -6,7 +6,9 @@
+ {{link-to "♥ Give kredits" "contributions.new" + (query-params contributorId=model.id) + class="button green"}} +
+