From 8f782fb22b825190a4eadff729329a3ca7fbf7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20B=C3=B6hlke?= Date: Wed, 18 Oct 2017 16:23:13 +0200 Subject: [PATCH 1/2] Remove logo upload feature, closes #30 --- app/locales/de/translations.js | 4 ---- app/locales/en/translations.js | 4 ---- app/models/instance.js | 5 ---- .../components/instance-add-form/template.hbs | 5 ---- .../instance-list-item/template.hbs | 3 --- .../instance-projector-logo/component.js | 17 ------------- .../instance-projector-logo/template.hbs | 16 ------------- .../instance-projector-logo/component-test.js | 24 ------------------- 8 files changed, 78 deletions(-) delete mode 100644 app/pods/components/instance-projector-logo/component.js delete mode 100644 app/pods/components/instance-projector-logo/template.hbs delete mode 100644 tests/integration/pods/components/instance-projector-logo/component-test.js diff --git a/app/locales/de/translations.js b/app/locales/de/translations.js index 99d9726..e2a3107 100644 --- a/app/locales/de/translations.js +++ b/app/locales/de/translations.js @@ -36,15 +36,11 @@ export default { 'action-upgrade-instance': 'Aktualisieren', 'new-instance': 'Neue OpenSlides-Instanz erstellen', 'instance-url': 'Instanz-URL', - 'projector-logo': 'Projektor-Logo', - 'upload_logo': 'Logo hochladen', - 'remove_logo': 'Logo löschen', 'delete': 'Löschen', 'close': 'Schließen', 'save': 'Speichern', 'cancel': 'Abbrechen', 'no-upgrades-available': 'Keine Aktualisierung verfügbar', - 'upload_projector_logo': 'Projektor-Logo hochladen', 'still-installing': 'Das Erstellen kann bis zu 2 Minuten dauern. Warten Sie, bis der Status auf "active" steht. Laden Sie regelmäßig dise Seite neu, um den Status zu aktualisieren.', 'title-upgrade': 'Instanz {{instance}} aktualisieren auf...', 'active': 'aktiv', diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js index 983c4bf..f14d73a 100644 --- a/app/locales/en/translations.js +++ b/app/locales/en/translations.js @@ -34,14 +34,10 @@ export default { 'new-instance': 'Create new OpenSlides instance', 'instance-url': 'Instance URL', - 'projector-logo': 'Projector logo', - 'upload_logo': 'Upload logo', - 'remove_logo': 'Remove', 'delete': 'Delete', 'close': 'Close', 'save': 'Spave', 'cancel': 'Cancel', - 'upload_projector_logo': 'Upload projector logo', 'still-installing': 'It can take up to two minutes to create the instance. Wait until the status is set to "active". Reload this page regularly to update the status.', 'title-upgrade': 'Upgrade instance {{instance}} to...', 'active': 'active', diff --git a/app/models/instance.js b/app/models/instance.js index 15debd7..5f48c9c 100644 --- a/app/models/instance.js +++ b/app/models/instance.js @@ -29,11 +29,6 @@ export default DS.Model.extend({ event_location: DS.attr('string'), event_organizer: DS.attr('string'), - projector_logo: DS.attr('string'), - projector_logo_url: Ember.computed('projector_logo', function() { - return '/api/blobs/' + this.get('projector_logo'); - }), - // Admin Attributes admin_first_name: DS.attr('string'), admin_last_name: DS.attr('string'), diff --git a/app/pods/components/instance-add-form/template.hbs b/app/pods/components/instance-add-form/template.hbs index 8f25748..8bf16bb 100644 --- a/app/pods/components/instance-add-form/template.hbs +++ b/app/pods/components/instance-add-form/template.hbs @@ -28,11 +28,6 @@ {{f.text-field "event_location"}} {{f.text-field "event_organizer"}} -
- - {{instance-projector-logo model=instance}} -
-

{{t 'admin_data'}}

{{f.text-field "admin_first_name"}} diff --git a/app/pods/components/instance-list-item/template.hbs b/app/pods/components/instance-list-item/template.hbs index ef9529e..a9143f8 100644 --- a/app/pods/components/instance-list-item/template.hbs +++ b/app/pods/components/instance-list-item/template.hbs @@ -67,9 +67,6 @@ -
- {{instance-projector-logo model=instance uploaded='uploaded'}} -
{{#if (eq instance.state 'active')}} diff --git a/app/pods/components/instance-projector-logo/component.js b/app/pods/components/instance-projector-logo/component.js deleted file mode 100644 index 3085e5f..0000000 --- a/app/pods/components/instance-projector-logo/component.js +++ /dev/null @@ -1,17 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ - actions: { - uploaded: function (blobIds) { - this.set('model.projector_logo', blobIds[0]); - this.set('isShowingModal', false); - this.sendAction('uploaded'); - }, - removeProjectorLogo: function () { - this.set('model.projector_logo', null); - }, - uploadProjectorLogo: function () { - this.set('isShowingModal', true); - } - } -}); diff --git a/app/pods/components/instance-projector-logo/template.hbs b/app/pods/components/instance-projector-logo/template.hbs deleted file mode 100644 index 0ae740a..0000000 --- a/app/pods/components/instance-projector-logo/template.hbs +++ /dev/null @@ -1,16 +0,0 @@ -{{#if model.projector_logo }} -
- -
-
{{t 'remove_logo'}}
-
{{t 'upload_logo'}}
-
-{{else}} -
-
{{t 'upload_logo'}}
-
-{{/if}} - -{{#if isShowingModal}} - {{upload-dialog close="uploaded" title=(t "upload_projector_logo")}} -{{/if}} diff --git a/tests/integration/pods/components/instance-projector-logo/component-test.js b/tests/integration/pods/components/instance-projector-logo/component-test.js deleted file mode 100644 index d4c6a8a..0000000 --- a/tests/integration/pods/components/instance-projector-logo/component-test.js +++ /dev/null @@ -1,24 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; -import hbs from 'htmlbars-inline-precompile'; - -moduleForComponent('instance-projector-logo', 'Integration | Component | instance projector logo', { - integration: true -}); - -test('it renders', function(assert) { - // Set any properties with this.set('myProperty', 'value'); - // Handle any actions with this.on('myAction', function(val) { ... }); - - this.render(hbs`{{instance-projector-logo}}`); - - assert.equal(this.$().text().trim(), ''); - - // Template block usage: - this.render(hbs` - {{#instance-projector-logo}} - template block text - {{/instance-projector-logo}} - `); - - assert.equal(this.$().text().trim(), 'template block text'); -}); From 6ee8231d0b54dc2570b0c480048db5b994e602c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20B=C3=B6hlke?= Date: Wed, 18 Oct 2017 19:18:33 +0200 Subject: [PATCH 2/2] Set default version in add form --- app/pods/components/instance-add-form/component.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/pods/components/instance-add-form/component.js b/app/pods/components/instance-add-form/component.js index 9146448..f25cc89 100644 --- a/app/pods/components/instance-add-form/component.js +++ b/app/pods/components/instance-add-form/component.js @@ -27,8 +27,13 @@ const validations = { export default Ember.Component.extend({ store: Ember.inject.service(), changeset: function () { - return new Changeset(this.get('instance'), lookupValidator(validations), validations); - }.property('instance'), + let changeset = new Changeset(this.get('instance'), lookupValidator(validations), validations); + changeset.set('osversion', this.get('defaultVersion')); + return changeset; + }.property('instance', 'versions'), + defaultVersion: Ember.computed('versions.@each', function() { + return this.get('versions').filter((version) => {return version.get('default');})[0]; + }), versionSort: ['id:desc'], sortedVersions: Ember.computed.sort('versions', 'versionSort'),