Only allow images to get connected to articles, issue #48

victorjonsson · Jul 22, 2014 · 92a0d1f · 92a0d1f
1 parent 1241143
commit 92a0d1f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 12 deletions.
diff --git a/arlima.php b/arlima.php
@@ -4,7 +4,7 @@
 Plugin URI: https://github.com/victorjonsson/Arlima
 Description: Manage the order of posts on your front page, or any page you want. This is a plugin suitable for online newspapers that's in need of a fully customizable front page.
 Author: VK (<a href="http://twitter.com/chredd">@chredd</a>, <a href="http://twitter.com/znoid">@znoid</a>, <a href="http://twitter.com/victor_jonsson">@victor_jonsson</a>, <a href="http://twitter.com/lefalque">@lefalque</a>)
-Version: 3.0.beta.42
+Version: 3.0.beta.43
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 */

diff --git a/classes/AbstractAdminPage.php b/classes/AbstractAdminPage.php
@@ -229,7 +229,8 @@ public function enqueueScripts()
                     'preview' => __('Preview list', 'arlima'),
                     'future' => __('Future post', 'arlima'),
                     'insertImage' => __('Add to article', 'arlima'),
-                    'noPostsFound' => __('No posts found', 'arlima')
+                    'noPostsFound' => __('No posts found', 'arlima'),
+                    'onlyImages' => __('You can only add images to articles', 'arlima')
                 )
             )
         );

diff --git a/constants.php b/constants.php
@@ -16,7 +16,7 @@
     or define('ARLIMA_COMPILE_LESS_IN_BROWSER', ARLIMA_DEV_MODE);
 
 // Plugin version (only edit this via grunt!)
-define('ARLIMA_FILE_VERSION', '3.0.beta.42' .(ARLIMA_DEV_MODE ? '__'.time():''));
+define('ARLIMA_FILE_VERSION', '3.0.beta.43' .(ARLIMA_DEV_MODE ? '__'.time():''));
 
 // Which type of tag to use for images in Arlima RSS feeds
 defined('ARLIMA_RSS_IMG_TAG')

diff --git a/js/arlima/arlima.js b/js/arlima/arlima.js
diff --git a/js/arlima/dev/ArlimaImageManager.js b/js/arlima/dev/ArlimaImageManager.js
@@ -96,12 +96,17 @@ var ArlimaImageManager = (function($, window, ArlimaArticleForm, ArlimaTemplateL
                     var attachment = window.wpMediaModal.state().get('selection').first().toJSON(),
                         connected = postID ? true:false;
 
-                    if( postID && !attachment.uploadedTo ) {
-                        // Not connected via upload
-                        ArlimaBackend.connectAttachmentToPost(attachment, attachment.id);
-                    }
+                    if( !window.ArlimaUtils.isImagePath(attachment.url) ) {
+                        alert(window.ArlimaJS.lang.onlyImages);
+                    } else {
 
-                    _this.setNewImage(attachment.url, attachment.id, connected);
+                        if( postID && !attachment.uploadedTo ) {
+                            // Not connected via upload
+                            ArlimaBackend.connectAttachmentToPost(attachment, attachment.id);
+                        }
+
+                        _this.setNewImage(attachment.url, attachment.id, connected);
+                    }
                 });
 
                 // Finally, open the modal

diff --git a/lang/arlima-sv_SE.mo b/lang/arlima-sv_SE.mo
diff --git a/lang/arlima.pot b/lang/arlima.pot
@@ -654,4 +654,7 @@ msgid "This field can only contain numbers"
 msgstr "Du måste ange en siffra."
 
 msgid "This field can not be empty"
-msgstr "Det här fältet kan inte lämnas tomt."
+msgstr "Det här fältet kan inte lämnas tomt."
+
+msgid "You can only add images to articles"
+msgstr "Du kan endast koppla en bild till artikeln"
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Contributors: @chredd, @znoid, @victor_jonsson, @lefalque, @aaslun
 Tags: CMS, e-paper, e-magazine, magazine, newspaper, front page, wysiwyg
 Requires at least: 3.8
 Tested up to: 3.9.1
-Stable tag: 3.0.beta.42
+Stable tag: 3.0.beta.43
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html