Merge branch 'release/1.0' of github.com:sulu/SuluArticleBundle

Content/ArticleDataProvider.php

@@ -124,7 +124,7 @@ protected function getConfigurationBuilder()
                     ['column' => 'published', 'title' => 'sulu_article.smart-content.published'],
                     ['column' => 'authored', 'title' => 'sulu_article.smart-content.authored'],
                     ['column' => 'created', 'title' => 'sulu_article.smart-content.created'],
-                    ['column' => 'title', 'title' => 'sulu_article.smart-content.title'],
+                    ['column' => 'title.raw', 'title' => 'sulu_article.smart-content.title'],
                     ['column' => 'author_full_name', 'title' => 'sulu_article.smart-content.author-full-name'],
                 ]
             );

Resources/public/js/components/articles/edit/main.js

@@ -20,8 +20,9 @@ define([
     'sulucontent/components/open-ghost-overlay/main',
     'services/sulucontent/smart-content-manager',
     './adapter/article',
-    './adapter/article-page'
-], function($, _, config, Util, ArticleManager, ArticleRouter, UserManager, SecurityChecker, CopyLocale, OpenGhost, SmartContentManager, Article, ArticlePage) {
+    './adapter/article-page',
+    'suluarticle/utils/template-helper'
+], function($, _, config, Util, ArticleManager, ArticleRouter, UserManager, SecurityChecker, CopyLocale, OpenGhost, SmartContentManager, Article, ArticlePage, TemplateHelper) {
 
     'use strict';
 
@@ -41,7 +42,7 @@ define([
             },
 
             templates: {
-                url: '/admin/api/articles<% if (!!id) { %>/<%= id %><% } %>?locale=<%= locale %>',
+                url: '/admin/api/articles<% if (!!data.id) { %>/<%= data.id %><% } %>?locale=<%= data.locale %>',
                 pageSwitcher: [
                     '<div class="page-changer">',
                     '   <span class="title"><%= label %></span>',
@@ -562,10 +563,10 @@ define([
         },
 
         getUrl: function(action) {
-            var url = _.template(this.defaults.templates.url, {
+            var url = TemplateHelper.transformTemplateData(_.template(this.defaults.templates.url, {
                 id: this.options.id,
                 locale: this.options.locale
-            });
+            }));
 
             if (action) {
                 url += '&action=' + action;

Resources/public/js/services/base-router.js

@@ -7,7 +7,7 @@
  * with this source code in the file LICENSE.
  */
 
-define(['underscore', 'services/husky/mediator'], function(_, Mediator) {
+define(['underscore', 'services/husky/mediator', 'suluarticle/utils/template-helper'], function(_, Mediator, TemplateHelper) {
 
     'use strict';
 
@@ -16,11 +16,11 @@ define(['underscore', 'services/husky/mediator'], function(_, Mediator) {
         },
 
         routes = {
-            list: _.template('articles/<%= locale %>'),
-            add: _.template('articles/<%= locale %>/add'),
-            edit: _.template('articles/<%= locale %>/edit:<%= id %>/<%= tab %>'),
-            editPage: _.template('articles/<%= locale %>/edit:<%= id %>/page:<%= page %>/<%= tab %>'),
-            addPage: _.template('articles/<%= locale %>/edit:<%= id %>/add-page/<%= tab %>')
+            list: TemplateHelper.transformTemplateData(_.template('articles/<%= data.locale %>')),
+            add: TemplateHelper.transformTemplateData(_.template('articles/<%= data.locale %>/add')),
+            edit: TemplateHelper.transformTemplateData(_.template('articles/<%= data.locale %>/edit:<%= data.id %>/<%= data.tab %>')),
+            editPage: TemplateHelper.transformTemplateData(_.template('articles/<%= data.locale %>/edit:<%= data.id %>/page:<%= data.page %>/<%= data.tab %>')),
+            addPage: TemplateHelper.transformTemplateData(_.template('articles/<%= data.locale %>/edit:<%= data.id %>/add-page/<%= data.tab %>'))
         },
 
         goto = function(route, trigger, force) {

Resources/public/js/services/list-helper.js

@@ -7,7 +7,7 @@
  * with this source code in the file LICENSE.
  */
 
-define(['underscore', 'services/husky/translator'], function(_, translator) {
+define(['underscore', 'services/husky/translator', 'suluarticle/utils/template-helper'], function(_, translator, TemplateHelper) {
 
     'use strict';
 
@@ -43,9 +43,9 @@ define(['underscore', 'services/husky/translator'], function(_, translator) {
         ),
 
         templates = {
-            draftIcon: _.template('<span class="draft-icon" title="<%= title %>"/>'),
-            publishedIcon: _.template('<span class="published-icon" title="<%= title %>"/>'),
-            shadowIcon: _.template('<span class="fa-share" title="<%= title %>"></span>'),
+            draftIcon: TemplateHelper.transformTemplateData(_.template('<span class="draft-icon" title="<%= data.title %>"/>')),
+            publishedIcon: TemplateHelper.transformTemplateData(_.template('<span class="published-icon" title="<%= data.title %>"/>')),
+            shadowIcon: TemplateHelper.transformTemplateData(_.template('<span class="fa-share" title="<%= data.title %>"></span>')),
         };
 
     return {

Resources/public/js/services/manager.js

@@ -7,25 +7,25 @@
  * with this source code in the file LICENSE.
  */
 
-define(['jquery', 'services/husky/util'], function($, Util) {
+define(['jquery', 'services/husky/util', 'suluarticle/utils/template-helper'], function($, Util, TemplateHelper) {
     'use strict';
 
     var templates = {
-        url: _.template(
+        url: TemplateHelper.transformTemplateData(_.template(
             '/admin/api/articles' +
-            '<% if (typeof id !== "undefined") { %>/<%= id %><% } %>' +
-            '<% if (typeof postfix !== "undefined") { %>/<%= postfix %><% } %>' +
-            '<% if (typeof version !== "undefined") { %>/<%= version %><% } %>' +
-            '?locale=<%= locale %>' +
-            '<% if (typeof action !== "undefined") { %>&action=<%= action %><% } %>' +
-            '<% if (typeof ids !== "undefined") { %>&ids=<%= ids.join(",") %><% } %>'
-        ),
-        pageUrl: _.template(
-            '/admin/api/articles/<%= articleId %>/pages' +
-            '<% if (typeof pageId !== "undefined" && !!pageId) { %>/<%= pageId %><% } %>' +
-            '?locale=<%= locale %>' +
-            '<% if (typeof action !== "undefined") { %>&action=<%= action %><% } %>'
-        )
+            '<% if (typeof data.id !== "undefined") { %>/<%= data.id %><% } %>' +
+            '<% if (typeof data.postfix !== "undefined") { %>/<%= data.postfix %><% } %>' +
+            '<% if (typeof data.version !== "undefined") { %>/<%= data.version %><% } %>' +
+            '?locale=<%= data.locale %>' +
+            '<% if (typeof data.action !== "undefined") { %>&action=<%= data.action %><% } %>' +
+            '<% if (typeof data.ids !== "undefined") { %>&ids=<%= data.ids.join(",") %><% } %>'
+        )),
+        pageUrl:TemplateHelper.transformTemplateData( _.template(
+            '/admin/api/articles/<%= data.articleId %>/pages' +
+            '<% if (typeof data.pageId !== "undefined" && !!data.pageId) { %>/<%= data.pageId %><% } %>' +
+            '?locale=<%= data.locale %>' +
+            '<% if (typeof data.action !== "undefined") { %>&action=<%= data.action %><% } %>'
+        ))
     };
 
     return {