From 3a78a21a102e2693d6226b2f75b8028bd0e75f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?= <p.mueller@pcsg.de>
Date: Wed, 12 Jul 2017 18:42:32 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20Mitgliedschafts-Panel=20=C3=B6ffnen=20na?=
=?UTF-8?q?ch=20Erstellung=20und=20refresh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/controls/MembershipsManager.js | 19 ++++++++++++-------
locale.xml | 4 ++--
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/bin/controls/MembershipsManager.js b/bin/controls/MembershipsManager.js
index b7a67a4..4139d19 100644
--- a/bin/controls/MembershipsManager.js
+++ b/bin/controls/MembershipsManager.js
@@ -327,13 +327,14 @@ define('package/quiqqer/memberships/bin/controls/MembershipsManager', [
Popup.Loader.show();
- Memberships.createMembership(title, groupIds).then(function (MembershipData) {
- if (!MembershipData) {
+ Memberships.createMembership(title, groupIds).then(function (membershipId) {
+ if (!membershipId) {
Popup.Loader.hide();
return;
}
- self.refresh();
+ self.$Grid.refresh();
+ self.$openMembershipPanel(membershipId);
Popup.close();
});
};
@@ -440,7 +441,7 @@ define('package/quiqqer/memberships/bin/controls/MembershipsManager', [
).then(function () {
self.Loader.hide();
Sheet.destroy();
- self.refresh();
+ self.$Grid.refresh();
});
}
}
@@ -508,7 +509,7 @@ define('package/quiqqer/memberships/bin/controls/MembershipsManager', [
}
Popup.close();
- self.refresh();
+ self.$Grid.refresh();
});
}
}
@@ -535,9 +536,13 @@ define('package/quiqqer/memberships/bin/controls/MembershipsManager', [
/**
* Opens a panel for a single membership
+ *
+ * @param {Number} [membershipId] - If omitted use selected from table
*/
- $openMembershipPanel: function () {
- var membershipId = this.$Grid.getSelectedData()[0].id;
+ $openMembershipPanel: function (membershipId) {
+ if (!membershipId) {
+ membershipId = this.$Grid.getSelectedData()[0].id;
+ }
require([
'package/quiqqer/memberships/bin/controls/Membership',
diff --git a/locale.xml b/locale.xml
index 70bee96..9daf514 100644
--- a/locale.xml
+++ b/locale.xml
@@ -182,8 +182,8 @@
<!-- Control: MembershipsSearchPopup -->
<locale name="controls.membershipssearchpopup.title">
- <de><![CDATA[Mitgliedschaften]]></de>
- <en><![CDATA[Memberships]]></en>
+ <de><![CDATA[Mitgliedschafts-Verwaltung]]></de>
+ <en><![CDATA[Membership Management]]></en>
</locale>
<!-- Control: MembershipsManagerPanel -->
--
GitLab