Merge pull request #85 from jmcameron/attachmentsid

add new button for {attachments id=xxx }

Author: JLTRY

Makefile

@@ -10,6 +10,7 @@ all: parts $(ZIPFILE)
 
 INSTALLS = attachments_plugin \
 	   add_attachment_btn_plugin \
+	   insert_attachments_id_token_btn_plugin \
 	   insert_attachments_token_btn_plugin \
 	   attachments_plugin_framework \
 	   attachments_for_content \

attachments_component/admin/language/el-GR/el-GR.com_attachments.ini

@@ -12,6 +12,8 @@ ATTACH_ACCESS_THIS_ATTACHMENT_TITLE="Προσπέλασε/κάνε λήψη αυ
 ATTACH_ADDED_DATA_FOR_N_ATTACHMENTS="Προστέθηκαν δεδομένα για %d συνημμένα!"
 ATTACH_ADDED_ICON_FILENAMES_TO_N_ATTACHMENTS="Προστέθηκαν ονόματα αρχείων εικονιδίων σε %d συνημμένα."
 ATTACH_ADD_ATTACHMENT="Προσθήκη συνημμένου"
+ATTACH_ADD_ATTACHMENT_IDS="Προσθήκη επιλεγμένων συνημμένων"
+ATTACH_ADD_ATTACHMENT_IDS_DESCRIPTION="Αυτή είναι μια λίστα των συνημμένων που έχουν ήδη προστεθεί στο άρθρο/κατηγορία. Επιλέξτε αυτό(ά) που θέλετε να προσθέσετε χρησιμοποιώντας την ένδειξη και πατήστε το κουμπί 'Προσθήκη επιλεγμένων συνημμένων'."
 ATTACH_ADD_ATTACHMENT_TITLE="Πρόσθεσε συνημμένο σε αυτό το άρθρο ή αντικείμενο περιεχομένου"
 ATTACH_ADD_ATTACHMENT_TO_S_INSTEAD_OF_S_TOOLTIP="Πρόσθεσε το συνημμένο σε %s (αντί για %s)"
 ATTACH_ADD_URL="Προσθήκη URL"

attachments_component/admin/language/en-GB/en-GB.com_attachments.ini

@@ -12,6 +12,8 @@ ATTACH_ACCESS_THIS_ATTACHMENT_TITLE="Access/download this attachment"
 ATTACH_ADDED_DATA_FOR_N_ATTACHMENTS="Added data for %d attachments!"
 ATTACH_ADDED_ICON_FILENAMES_TO_N_ATTACHMENTS="Added icon filenames to %d attachment(s)."
 ATTACH_ADD_ATTACHMENT="Add attachment"
+ATTACH_ADD_ATTACHMENT_IDS="Add selected attachments"
+ATTACH_ADD_ATTACHMENT_IDS_DESCRIPTION="This is a list of attachments already added the the article/category. Select which one(s) you want to insert using the token and press the 'Add selected attachments' button."
 ATTACH_ADD_ATTACHMENT_TITLE="Add attachment to this article or content item"
 ATTACH_ADD_ATTACHMENT_TO_S_INSTEAD_OF_S_TOOLTIP="Add the attachment to a %s (instead of %s)"
 ATTACH_ADD_URL="Add URL"

attachments_component/admin/language/fr-FR/fr-FR.com_attachments.ini

@@ -12,6 +12,8 @@ ATTACH_ACCESS_THIS_ATTACHMENT_TITLE="Voir/télécharger cette pièce jointe"
 ATTACH_ADDED_DATA_FOR_N_ATTACHMENTS="Donnée ajoutée pour %d pièces jointes!"
 ATTACH_ADDED_ICON_FILENAMES_TO_N_ATTACHMENTS="Icône ajoutée à %d pièce(s)-jointe(s)."
 ATTACH_ADD_ATTACHMENT="Ajouter une pièce jointe"
+ATTACH_ADD_ATTACHMENT_IDS="Ajoute la(les) pièces jointe(s) sélectionnée(s)"
+ATTACH_ADD_ATTACHMENT_IDS_DESCRIPTION="Si desssous vous avez la liste des pièces jointes déjà ajoutées à l'article/la catégorie. Selectionnez celle(s) qu vous voulez ajouter avec le token et apputer sur le bouton 'Ajoute la(les) pièces jointe(s) sélectionnée(s)'."
 ATTACH_ADD_ATTACHMENT_TITLE="Ajouter la pièce jointe à l'article ou au contenu"
 ATTACH_ADD_ATTACHMENT_TO_S_INSTEAD_OF_S_TOOLTIP="Ajouter la pièce jointe à un %s (Au lieu de %s)"
 ATTACH_ADD_URL="Ajouter l'adresse"

attachments_component/admin/language/fr-FR/fr-FR.com_attachments.sys.ini

@@ -13,3 +13,4 @@ ATTACH_PACKAGE_ATTACHMENTS_FOR_JOOMLA_16PLUS="Attachments pour Joomla 2.5+"
 ATTACH_PLEASE_REPORT_BUGS_AND_SUGGESTIONS_TO_S="Merci de signaler les bugs et vos suggestions à %s"
 COM_ATTACHMENTS="Attachments"
 COM_ATTACHMENTS_CONFIGURATION="Configuration du composant Attachments"
+ATTACH_PACKAGE_NOTICE_UNINSTALL_PACKAGE_S="Pou désinstaller l'extension 'Attachments, désinstaller le Package '%s'!"

attachments_component/admin/src/Model/AttachmentsModel.php

@@ -45,6 +45,7 @@ public function __construct($config = array())
 		if (empty($config['filter_fields'])) {
 			$config['filter_fields'] = array(
 				'id',
+				'parent_id',
 				'a.state',
 				'a.access',
 				'a.filename',
@@ -80,7 +81,11 @@ protected function getListQuery()
 		/** @var \Joomla\Database\DatabaseDriver $db */
 		$db = Factory::getContainer()->get('DatabaseDriver');
 		$query = $db->getQuery(true);
-
+		$id = $this->getState('filter.parent_id');
+		if (is_numeric($id))
+		{
+			$query->where('a.parent_id = ' . (int) $id);
+		}
 		$query->select('a.*, a.id as id');
 		$query->from('#__attachments as a');
 

attachments_component/admin/src/View/Attachments/HtmlView.php

@@ -16,6 +16,7 @@
 use JMCameron\Component\Attachments\Administrator\Helper\AttachmentsPermissions;
 use JMCameron\Component\Attachments\Site\Helper\AttachmentsDefines;
 use JMCameron\Plugin\AttachmentsPluginFramework\AttachmentsPluginManager;
+use JMCameron\Component\Attachments\Administrator\Model\AttachmentsModel;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
@@ -52,10 +53,18 @@ public function display($tpl = null)
 			return;
 			}
 
+		$app = Factory::getApplication();
+		$jinput = $app->getInput();
+		$this->editor = $jinput->getString('editor', null);
+		$id = $jinput->getInt('parent_id', null);
+		if ($id) {
+			$model = $this->getModel();
+			$model->setState('filter.parent_id', $id); 
+		}
 		$this->items = $this->get('Items');
 		$this->state = $this->get('State');
 		$this->pagination = $this->get('Pagination');
-
+		
 		// Check for errors.
 		if (count($errors = $this->get('Errors'))) {
 			throw new \Exception(implode("\n", $errors) . ' (ERR 175)', 500);
@@ -166,9 +175,22 @@ public function display($tpl = null)
 			}
 
 		// Set the toolbar
-		$this->addToolBar();
+		if ( !$this->editor ) {
+			$this->addToolBar();
+			}
 
 		// Display the attachments
+		if ( $this->editor ) {
+			$document = Factory::getDocument();
+			HTMLHelper::_('jquery.framework');
+			$document->addScriptDeclaration('function insertAttachmentsIdToken($, editorName) {
+				let editor = parent.Joomla.editors.instances[editorName];
+				var adminform = document.getElementById("adminForm");
+				var Data = new FormData(adminform);
+				editor.replaceSelection("{attachments id=" + Data.getAll("cid[]") +"}");
+				$(".btn-close", parent.document).click();
+				}');
+			}
 		parent::display($tpl);
 	}
 

attachments_component/admin/tmpl/attachments/default.php

@@ -14,8 +14,10 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
 
+
 // No direct access
 defined('_JEXEC') or die('Restricted access');
 
@@ -31,7 +33,15 @@
 
 ?>
 <form action="<?php echo Route::_('index.php?option=com_attachments'); ?>" method="post" name="adminForm" id="adminForm">
-<?php echo $this->loadTemplate('filter');?>
+<?php if ( $this->editor ) : ?>
+		<p><?php echo Text::_('ATTACH_ADD_ATTACHMENT_IDS_DESCRIPTION'); ?></p>
+		<button onclick="insertAttachmentsIdToken(jQuery, '<?php echo $this->editor ?>');"><?php echo Text::_('ATTACH_ADD_ATTACHMENT_IDS'); ?></button>
+<?php endif; ?>
+<?php 
+	if (!$this->editor ) {
+		echo $this->loadTemplate('filter');
+	}
+?>
   <table class="adminlist" id="attachmentsList">
 	<thead><?php echo $this->loadTemplate('head');?></thead>
 	<tbody><?php echo $this->loadTemplate('body');?></tbody>
@@ -44,5 +54,7 @@
 	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
 	<?php echo HTMLHelper::_('form.token'); ?>
   </div>
+  
 </form>
 
+

attachments_component/admin/tmpl/attachments/default_body.php

@@ -115,10 +115,14 @@
    ?>
 	<tr class="<?php echo "row$k"; ?>">
 	  <td class="at_checked hidden-phone"><?php echo $checked; ?></td>
+	<?php if ( !$this->editor ) : ?>
 	  <td class="at_published" align="center"><?php echo $published;?></td>
+	<?php endif; ?>
 	  <td class="at_filename">
-		 <a href="<?php echo $link; ?>" title="<?php echo $edit_attachment_title; ?>"
-		  ><?php echo HTMLHelper::image('com_attachments/file_icons/'.$icon, $download_verb, null, true);
+	  <?php if ( !$this->editor ) : ?>
+		 <a href="<?php echo $link; ?>" title="<?php echo $edit_attachment_title; ?>" >
+	  <?php endif; ?>
+		  <?php echo HTMLHelper::image('com_attachments/file_icons/'.$icon, $download_verb, null, true);
 		if ( ($item->uri_type == 'url') && $superimpose_link_icons ) {
 			if ( $item->url_valid ) {
 				echo HTMLHelper::image('com_attachments/file_icons/link_arrow.png', '', 'class="link_overlay"', true);
@@ -127,7 +131,11 @@
 				echo HTMLHelper::image('com_attachments/file_icons/link_broken.png', '', 'class="link_overlay"', true);
 				}
 			}
-		 ?></a>&nbsp;<a
+		 ?>
+	  <?php if ( !$this->editor ) : ?>
+		 </a>
+	<?php endif; ?>
+		 &nbsp;<a
 		 href="<?php echo $link; ?>" title="<?php echo $edit_attachment_title; ?>"
 			 ><?php if ( $item->uri_type == 'file' ) {
 				echo $item->filename;

attachments_component/admin/tmpl/attachments/default_head.php

@@ -30,8 +30,10 @@
 	 <th class="at_checked hidden-phone">
 		 <input type="checkbox" name="checkall-toggle" value="" onclick="Joomla.checkAll(this)" />
 	 </th>
+	 <?php if ( !$this->editor ) : ?>
 	 <th class="at_published" width="5%" nowrap="nowrap"><?php echo HTMLHelper::_('grid.sort', 'ATTACH_PUBLISHED',
 							 'a.state', $listDirn, $listOrder ) ?></th>
+	<?php endif; ?>
 	 <th class="at_filename"><?php echo HTMLHelper::_('grid.sort', 'ATTACH_ATTACHMENT_FILENAME_URL',
 							 'a.filename', $listDirn, $listOrder ) ?></th>
 	 <th class="at_description"><?php echo HTMLHelper::_('grid.sort', 'ATTACH_DESCRIPTION',