Tobias Jeger pushed to branch feature/cmng-psp1-CHANNELMGR-688 at cms-community
/ hippo-addon-channel-manager
Commits:
e27625a9 by Tobias Jeger at 2016-05-24T13:30:56+02:00
CHANNELMGR-688 Rework after review
- - - - -
5 changed files:
- frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
- frontend-ng/src/angularjs/channel/page/actions/pageActions.spec.js
- frontend-ng/src/angularjs/utils/directive/illegalCharacters.directive.spec.js
- frontend-ng/src/i18n/en.json
- frontend-ng/src/i18n/nl.json
Changes:
=====================================
frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
@@ -125,9 +125,9 @@ export class PageActionsCtrl {
// do nothing on cancel
}
- _confirmDelete(pageTitle) {
+ _confirmDelete(page) {
const confirm = this.DialogService.confirm()
- .title(`${this.$translate.instant('DELETE')} '${pageTitle}'?`)
+ .title(this.$translate.instant('CONFIRM_DELETE_PAGE_MESSAGE', { page }))
.ok(this.$translate.instant('DELETE'))
.cancel(this.$translate.instant('CANCEL'));
=====================================
frontend-ng/src/angularjs/channel/page/actions/pageActions.spec.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/pageActions.spec.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/pageActions.spec.js
@@ -195,12 +195,6 @@ describe('PageActions', () => {
expect(copyAction.isEnabled()).toBe(true);
});
- it('builds the action label correctly', () => {
- SiteMapItemService.isEditable.and.returnValue(false);
-
- SiteMapItemService.isEditable.and.returnValue(true);
- });
-
it('does nothing when not confirming the deletion of a page', () => {
const PageActionsCtrl = compileDirectiveAndGetController();
const deleteAction = PageActionsCtrl.actions.find((action) => action.id
=== 'delete');
=====================================
frontend-ng/src/angularjs/utils/directive/illegalCharacters.directive.spec.js
=====================================
---
a/frontend-ng/src/angularjs/utils/directive/illegalCharacters.directive.spec.js
+++
b/frontend-ng/src/angularjs/utils/directive/illegalCharacters.directive.spec.js
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-describe('PageActionCreate', () => {
+describe('IllegalCharactersDirective', () => {
'use strict';
let $rootScope;
=====================================
frontend-ng/src/i18n/en.json
=====================================
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -6,6 +6,7 @@
"CHANNEL_PROPERTIES_SAVE_SUCCESS": "Channel settings saved successfully",
"CONFIRM_DELETE_COMPONENT_MESSAGE": "Are you sure you want to remove the
component '{{component}}' from this template?",
"CONFIRM_DELETE_COMPONENT_TITLE": "Confirm remove",
+ "CONFIRM_DELETE_PAGE_MESSAGE": "Delete '{{page}}'?",
"CONFIRM_DISCARD_SELECTED_CHANGES_MESSAGE": "Discard all selected changes?",
"CONFIRM_DISCARD_OWN_CHANGES_MESSAGE": "Are you sure you want to discard all
your unpublished changes to this channel?",
"CONFIRM_DISCARD_CHANGES_TITLE": "Confirm discard changes",
=====================================
frontend-ng/src/i18n/nl.json
=====================================
--- a/frontend-ng/src/i18n/nl.json
+++ b/frontend-ng/src/i18n/nl.json
@@ -6,6 +6,7 @@
"CHANNEL_PROPERTIES_SAVE_SUCCESS": "???",
"CONFIRM_DELETE_COMPONENT_MESSAGE": "Weet u zeker dat u {0} wilt
verwijderen?",
"CONFIRM_DELETE_COMPONENT_TITLE": "Bevestig het verwijderen",
+ "CONFIRM_DELETE_PAGE_MESSAGE": "'{{page}}' verwijderen?",
"CONFIRM_DISCARD_SELECTED_CHANGES_MESSAGE": "Maak de geselecteerde
wijzigingen ongedaan?",
"CONFIRM_DISCARD_OWN_CHANGES_MESSAGE": "Weet u zeker dat u al uw
ongepubliceerde veranderingen in dit channel ongedaan wilt maken?",
"CONFIRM_DISCARD_CHANGES_TITLE": "Bevestig ongedaan maken",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e27625a92c18d060670ed46ed401d613e594150b
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
