Skip to content

Commit

Permalink
add publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexander-schranz
alexander-schranz committed Jul 18, 2016
1 parent 914d063 commit 516e8f6
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 43 deletions.
20 changes: 20 additions & 0 deletions Controller/ArticleController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,12 @@ public function getAction($uuid, Request $request)
*/
public function postAction(Request $request)
{
$action = $request->get('action');
$document = $this->getDocumentManager()->create(self::DOCUMENT_TYPE);
$locale = $this->getRequestParameter($request, 'locale', true);

$this->persistDocument($request->request->all(), $document, $locale);
$this->handleActionParameter($action, $document, $locale);
$this->getDocumentManager()->flush();

return $this->handleView(
Expand All @@ -183,6 +185,7 @@ public function postAction(Request $request)
public function putAction(Request $request, $uuid)
{
$locale = $this->getRequestParameter($request, 'locale', true);
$action = $request->get('action');

$document = $this->getDocumentManager()->find(
$uuid,
Expand All @@ -196,6 +199,7 @@ public function putAction(Request $request, $uuid)
$this->get('sulu_hash.request_hash_checker')->checkHash($request, $document, $document->getUuid());

$this->persistDocument($request->request->all(), $document, $locale);
$this->handleActionParameter($action, $document, $locale);
$this->getDocumentManager()->flush();

return $this->handleView(
Expand Down Expand Up @@ -288,4 +292,20 @@ protected function getDocumentManager()
{
return $this->get('sulu_document_manager.document_manager');
}

/**
* Delegates actions by given actionParameter, which can be retrieved from the request.
*
* @param string $actionParameter
* @param object $document
* @param string $locale
*/
private function handleActionParameter($actionParameter, $document, $locale)
{
switch ($actionParameter) {
case 'publish':
$this->getDocumentManager()->publish($document, $locale);
break;
}
}
}
42 changes: 41 additions & 1 deletion Document/ArticleDocument.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Sulu\Component\Content\Document\Behavior\LocalizedAuditableBehavior;
use Sulu\Component\Content\Document\Behavior\LocalizedStructureBehavior;
use Sulu\Component\Content\Document\Behavior\StructureBehavior;
use Sulu\Component\Content\Document\Behavior\WorkflowStageBehavior;
use Sulu\Component\Content\Document\Extension\ExtensionContainer;
use Sulu\Component\Content\Document\Structure\Structure;
use Sulu\Component\Content\Document\Structure\StructureInterface;
Expand All @@ -41,7 +42,8 @@ class ArticleDocument implements
LocalizedAuditableBehavior,
DateShardingBehavior,
RoutableInterface,
ExtensionBehavior
ExtensionBehavior,
WorkflowStageBehavior
{
/**
* @var string
Expand Down Expand Up @@ -125,6 +127,20 @@ class ArticleDocument implements
*/
protected $extensions;

/**
* Workflow Stage currently Test or Published.
*
* @var int
*/
protected $workflowStage;

/**
* Is Document is published.
*
* @var bool
*/
protected $published;

public function __construct()
{
$this->structure = new Structure();
Expand Down Expand Up @@ -359,4 +375,28 @@ public function setExtension($name, $data)
{
$this->extensions[$name] = $data;
}

/**
* {@inheritdoc}
*/
public function getWorkflowStage()
{
return $this->workflowStage;
}

/**
* {@inheritdoc}
*/
public function setWorkflowStage($workflowStage)
{
$this->workflowStage = $workflowStage;
}

/**
* {@inheritdoc}
*/
public function getPublished()
{
return $this->published;
}
}
1 change: 1 addition & 0 deletions Resources/config/serializer/Document.ArticleDocument.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<property name="created" type="DateTime" groups="defaultPage"/>
<property name="changed" type="DateTime" groups="defaultPage"/>

<property name="published" type="DateTime" groups="defaultPage,smallPage"/>
<property name="extensions" type="Sulu\Component\Content\Document\Extension\ExtensionContainer" serialized-name="ext" groups="defaultPage,preview"/>
</class>
</serializer>
15 changes: 6 additions & 9 deletions Resources/public/js/components/articles/edit/details/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ define(['underscore', 'jquery', 'config'], function(_, $, Config) {
},

listenForChange: function() {
this.sandbox.dom.on(this.$el, 'keyup change', _.debounce(this.setDirty.bind(this), 10), '.trigger-save-button');
this.sandbox.dom.on(this.$el, 'keyup', _.debounce(this.setDirty.bind(this), 10), 'input, textarea');
this.sandbox.dom.on(this.$el, 'change', _.debounce(this.setDirty.bind(this), 10), 'input[type="checkbox"], select');
this.sandbox.on('sulu.content.changed', this.setDirty.bind(this));
},

Expand All @@ -55,17 +56,15 @@ define(['underscore', 'jquery', 'config'], function(_, $, Config) {
this.sandbox.emit('sulu.tab.dirty');
},

save: function() {
save: function(action) {
if (!this.sandbox.form.validate(this.formId)) {
return this.sandbox.emit('sulu.tab.dirty', true);
}

var data = this.sandbox.form.getData(this.formId);
data.template = this.template;
this.sandbox.util.save(this.options.url(), !this.data.id ? 'POST' : 'PUT', data).then(function(data) {
this.data = data;
this.sandbox.emit('sulu.tab.saved', data);
}.bind(this));

this.sandbox.emit('sulu.articles.save', data, action);
},

render: function() {
Expand Down Expand Up @@ -107,9 +106,7 @@ define(['underscore', 'jquery', 'config'], function(_, $, Config) {
},

loadFormTemplate: function(template) {
if (!!template) {
this.setDirty();
} else {
if (!template) {
var types = Config.get('sulu_article.types');
template = types[(this.options.type || this.data.type)];
}
Expand Down
5 changes: 1 addition & 4 deletions Resources/public/js/components/articles/edit/excerpt/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ define([], function() {
var content = this.options.data();
content.ext.excerpt = data;

this.sandbox.util.save(this.options.url(), !content.id ? 'POST' : 'PUT', content).then(function(data) {
this.data = data;
this.sandbox.emit('sulu.tab.saved', data);
}.bind(this));
this.sandbox.emit('sulu.articles.save', data, action);
}
};
});
93 changes: 68 additions & 25 deletions Resources/public/js/components/articles/edit/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* with this source code in the file LICENSE.
*/

define(['jquery', 'underscore'], function($, _) {
define(['jquery', 'underscore', 'sulusecurity/services/user-manager'], function($, _, UserManager) {

'use strict';

Expand All @@ -23,14 +23,15 @@ define(['jquery', 'underscore'], function($, _) {
},

translations: {
headline: 'sulu_article.edit.title'
headline: 'sulu_article.edit.title',
draftLabel: 'sulu-content.draft-label'
}
},

header: function() {
var buttons = {
save: {
parent: 'saveWithOptions'
parent: 'saveWithDraft'
},
template: {
options: {
Expand Down Expand Up @@ -76,14 +77,17 @@ define(['jquery', 'underscore'], function($, _) {
this.saveState = 'disabled';

this.bindCustomEvents();
this.showDraftLabel();
},

bindCustomEvents: function() {
this.sandbox.on('sulu.header.back', this.toList.bind(this));
this.sandbox.on('sulu.tab.dirty', this.enableSave.bind(this));
this.sandbox.on('sulu.tab.dirty', this.setHeaderBar.bind(this));
this.sandbox.on('sulu.toolbar.save', this.save.bind(this));
this.sandbox.on('sulu.toolbar.delete', this.deleteItem.bind(this));
this.sandbox.on('sulu.tab.data-changed', this.setData.bind(this));
this.sandbox.on('sulu.articles.save', this.saveArticle.bind(this));
this.sandbox.on('sulu.tab.saved', this.showDraftLabel.bind(this));

this.sandbox.on('sulu.header.language-changed', function(item) {
this.sandbox.sulu.saveUserSetting(this.options.config.settingsKey, item.id);
Expand Down Expand Up @@ -120,7 +124,7 @@ define(['jquery', 'underscore'], function($, _) {
save: function(action) {
this.loadingSave();

this.saveTab().then(function(data) {
this.saveTab(action).then(function(data) {
this.afterSave(action, data);
}.bind(this));
},
Expand All @@ -129,7 +133,7 @@ define(['jquery', 'underscore'], function($, _) {
this.data = data;
},

saveTab: function() {
saveTab: function(action) {
var promise = $.Deferred();

this.sandbox.once('sulu.tab.saved', function(savedData) {
Expand All @@ -138,27 +142,33 @@ define(['jquery', 'underscore'], function($, _) {
promise.resolve(savedData);
}.bind(this));

this.sandbox.emit('sulu.tab.save');
this.sandbox.emit('sulu.tab.save', action);

return promise;
},

enableSave: function(force) {
if (!force && this.saveState === 'loading') {
return;
}

this.saveState = 'enabled';
this.sandbox.emit('sulu.header.toolbar.item.enable', 'save', false);
saveArticle: function(data, action) {
return this.sandbox.util.save(this.getUrl(action), !this.data.id ? 'POST' : 'PUT', data).then(function(data) {
this.data = data;
this.sandbox.emit('sulu.tab.saved', data);
}.bind(this));
},

disableSave: function(force) {
if (!force && this.saveState === 'loading') {
return;
}
setHeaderBar: function(saved) {
var saveDraft = !saved,
savePublish = !saved,
publish = !!saved && !this.data.publishedState;

this.saveState = 'disabled';
this.sandbox.emit('sulu.header.toolbar.item.disable', 'save', true);
this.setSaveToolbarItems.call(this, 'saveDraft', saveDraft);
this.setSaveToolbarItems.call(this, 'savePublish', savePublish);
this.setSaveToolbarItems.call(this, 'publish', publish);
this.setSaveToolbarItems.call(this, 'save', (!!saveDraft || !!savePublish || !!publish));

this.saved = saved;
},

setSaveToolbarItems: function(item, value) {
this.sandbox.emit('sulu.header.toolbar.item.' + (!!value ? 'enable' : 'disable'), item, false);
},

loadingSave: function() {
Expand All @@ -167,7 +177,7 @@ define(['jquery', 'underscore'], function($, _) {
},

afterSave: function(action, data) {
this.disableSave(true);
this.setHeaderBar(true);
this.sandbox.emit('sulu.header.saved', data);

if (action === 'back') {
Expand All @@ -179,6 +189,42 @@ define(['jquery', 'underscore'], function($, _) {
}
},

showDraftLabel: function() {
this.sandbox.emit('sulu.header.tabs.label.hide');

if (!this.data.id || !!this.data.publishedState) {
return;
}

this.setHeaderBar(true);

UserManager.find(this.data.changer).then(function(response) {
this.sandbox.emit(
'sulu.header.tabs.label.show',
this.sandbox.util.sprintf(
this.sandbox.translate(this.translations.draftLabel),
{
changed: this.sandbox.date.format(this.data.changed, true),
user: response.username
}
)
);
}.bind(this));
},

getUrl: function(action) {
var url = _.template(this.defaults.templates.url, {
id: this.options.id,
locale: this.options.locale
});

if (action) {
url += '&action=' + action;
}

return url;
},

loadComponentData: function() {
var promise = $.Deferred();

Expand All @@ -188,10 +234,7 @@ define(['jquery', 'underscore'], function($, _) {
return promise;
}

this.sandbox.util.load(_.template(this.defaults.templates.url, {
id: this.options.id,
locale: this.options.locale
})).done(function(data) {
this.sandbox.util.load(this.getUrl()).done(function(data) {
promise.resolve(data);
});

Expand Down
5 changes: 1 addition & 4 deletions Resources/public/js/components/articles/edit/seo/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ define(function() {
var content = this.options.data();
content.ext.seo = data;

this.sandbox.util.save(this.options.url(), !content.id ? 'POST' : 'PUT', content).then(function(data) {
this.data = data;
this.sandbox.emit('sulu.tab.saved', data);
}.bind(this));
this.sandbox.emit('sulu.articles.save', data, action);
}
};
});

0 comments on commit 516e8f6

Please sign in to comment.