Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(target): Moved target entity to Publish pane #2769

Merged
merged 1 commit into from
Jan 18, 2019
Merged

feat(target): Moved target entity to Publish pane #2769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/apps/authoring/authoring/directives/SendItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ SendItem.$inject = ['$q', 'api', 'search', 'desks', 'notify', 'authoringWorkspac
'superdeskFlags', '$location', 'macros', '$rootScope', 'deployConfig',
'authoring', 'send', 'editorResolver', 'confirm', 'archiveService',
'preferencesService', 'multi', 'datetimeHelper', 'config', 'privileges',
'storage', 'modal', 'gettext', 'urls', 'extensionPoints'];
'storage', 'modal', 'gettext', 'urls', 'extensionPoints', 'metadata'];
export function SendItem($q, api, search, desks, notify, authoringWorkspace,
superdeskFlags, $location, macros, $rootScope, deployConfig,
authoring, send, editorResolver, confirm, archiveService,
preferencesService, multi, datetimeHelper, config, privileges,
storage, modal, gettext, urls, extensionPoints) {
storage, modal, gettext, urls, extensionPoints, metadata) {
return {
scope: {
item: '=',
Expand Down Expand Up @@ -64,6 +64,8 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
scope.$watch('item', activateItem);
scope.$watch(send.getConfig, activateConfig);

scope.metadata = metadata.values;

scope.publish = function() {
scope.loading = true;
var result = scope._publish();
Expand Down
31 changes: 31 additions & 0 deletions scripts/apps/authoring/views/send-item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,37 @@
<div sd-toggle-box id="timezoneTimestamp" ng-if="mode === 'authoring' && showTimezone()" data-title="Timezone" data-open="true" data-style="circle">
<div sd-timezone data-timezone="item.time_zone" class="timezone-input--dark"></div>
</div>

<div sd-toggle-box id="target" data-title="Target" data-open="true" data-style="circle">
<div class="form__row">
<label class="form-label" translate>Target Subscribers</label>
<div class="term-editor"
sd-meta-terms
data-item="item"
data-unique="_id"
data-list="metadata.customSubscribers"
data-field="target_subscribers"
data-header="true"
data-reload-list="true">
</div>
</div>

<div class="form__row">
<label class="form-label" translate>Target Regions</label>
<div sd-meta-target
data-list="metadata.regions"
data-targets="item.target_regions">
</div>
</div>

<div class="form__row">
<label class="form-label" translate>Target Types</label>
<div sd-meta-target
data-list="metadata.subscriberTypes"
data-targets="item.target_types">
</div>
</div>
</div>
</div>
<div ng-if="vm.userActions.publish_pane_two_columns" class="side-panel__content-block side-panel__content-block--right">
<div sd-extension-point="authoring:publish"
Expand Down