joomla/patchtester
33
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2024-12-23 03:19:00 +00:00
Code Issues Releases Activity

Merge pull request #33 from n9iels/master

Browse Source 
Remove joomlacode references
This commit is contained in:
Michael Babker 2014-09-01 12:45:01 -04:00
commit 0fe1125bc0
11 changed files with 4 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
administrator/components/com_patchtester/install/sql/mysql/install.sql
View File

@ -4,7 +4,6 @@ CREATE TABLE IF NOT EXISTS `#__patchtester_pulls` (
`title` varchar(100) NOT NULL,
`description` varchar(5000) NOT NULL DEFAULT '',
`pull_url` varchar(255) NOT NULL,
`joomlacode_id` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8;

1
administrator/components/com_patchtester/install/sql/postgresql/install.sql
View File

@ -4,7 +4,6 @@ CREATE TABLE IF NOT EXISTS "#__patchtester_pulls" (
"title" character varying(100) NOT NULL,
"description" character varying(5000) DEFAULT '' NOT NULL,
"pull_url" character varying(255) NOT NULL,
"joomlacode_id" character varying(255) DEFAULT '' NOT NULL,
PRIMARY KEY ("id")
);

1
administrator/components/com_patchtester/install/sql/sqlsrv/install.sql
View File

@ -4,7 +4,6 @@ CREATE TABLE IF NOT EXISTS [#__patchtester_pulls] (
[title] [nvarchar](100) NOT NULL,
[description] [nvarchar](5000) NOT NULL DEFAULT '',
[pull_url] [nvarchar](255) NOT NULL,
[joomlacode_id] [nvarchar](255) NOT NULL DEFAULT '',
CONSTRAINT [PK_#__patchtester_pulls] PRIMARY KEY CLUSTERED
(
[id] ASC

4
administrator/components/com_patchtester/language/de-DE/de-DE.com_patchtester.ini
View File

@ -1,4 +1,4 @@
; Joomla! Project
; Joomla! Project
; Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 - 2014 Open Source Matters, Inc. All rights reserved.
; License GNU General Public License version 2 or later
; Note : All ini files need to be saved as UTF-8
@ -27,12 +27,10 @@ COM_PATCHTESTER_FIELD_REPO_LABEL="Github Repository"
COM_PATCHTESTER_FIELD_REPO_DESC="Name des Github Repositories von welchem Pull Requests beobachtet werden sollen."
COM_PATCHTESTER_FILE_DELETED_DOES_NOT_EXIST_S="Die zu löschende Datei existiert nicht: %s"
COM_PATCHTESTER_FILE_MODIFIED_DOES_NOT_EXIST_S="Die zu ändernde Datei existiert nicht: %s"
COM_PATCHTESTER_JOOMLACODE_ISSUE="Joomlacode Tracker"
COM_PATCHTESTER_PULL_ID="Pull ID"
COM_PATCHTESTER_NO_CREDENTIALS="Es wurden noch keine Benutzerdaten eingetragen, somit können höchstens 60 Anfragen pro Stunde an die Github API gestellt werden. Mit Benutzerdaten sind bis zu 5.000 Anfragen pro Stunde möglich."
COM_PATCHTESTER_NOT_APPLIED="Nicht angewendet"
COM_PATCHTESTER_OPEN_IN_GITHUB="In GitHub öffnen"
COM_PATCHTESTER_OPEN_IN_JOOMLACODE="In JoomlaCode öffnen"
COM_PATCHTESTER_PURGE_CACHE="Cache löschen"
COM_PATCHTESTER_PURGE_FAIL="Der Cache konnte nicht vollständig gelöscht werden, %s Dateien wurden nicht gelöscht."
COM_PATCHTESTER_PURGE_FAIL_1="Der Cache konnte nicht vollständig gelöscht werden, %s Datei wurde nicht gelöscht."

2
administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
View File

@ -30,13 +30,11 @@ COM_PATCHTESTER_FIELD_REPO_DESC="Name of a repository on GitHub of which to moni
COM_PATCHTESTER_FILE_DELETED_DOES_NOT_EXIST_S="The file marked for deletion does not exist: %s"
COM_PATCHTESTER_FILE_MODIFIED_DOES_NOT_EXIST_S="The file marked for modification does not exist: %s"
COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION="Filter the list by title or ID."
COM_PATCHTESTER_JOOMLACODE_ISSUE="Joomlacode Issue"
COM_PATCHTESTER_PULL_ID="Pull ID"
COM_PATCHTESTER_NO_CREDENTIALS="No user credentials are saved, this will allow only 60 requests to the GitHub API per hour. Saving user credentials will allow 5,000 requests per hour."
COM_PATCHTESTER_NO_ITEMS="No data has been retrieved from GitHub, please click the 'Fetch Data' button in the toolbar to retrieve the open pull requests."
COM_PATCHTESTER_NOT_APPLIED="Not Applied"
COM_PATCHTESTER_OPEN_IN_GITHUB="Open in GitHub"
COM_PATCHTESTER_OPEN_IN_JOOMLACODE="Open in JoomlaCode"
COM_PATCHTESTER_REPO_IS_GONE="The patch could not be applied because the repository is missing"
COM_PATCHTESTER_REQUIREMENT_HTTPS="HTTPS wrappers must be enabled"
COM_PATCHTESTER_REQUIREMENT_OPENSSL="The OpenSSL extension must be installed and enabled in your php.ini"

4
administrator/components/com_patchtester/language/fr-FR/fr-FR.com_patchtester.ini
View File

@ -1,4 +1,4 @@
; Joomla! Project
; Joomla! Project
; Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 Open Source Matters, Inc. All rights reserved.
; License GNU General Public License version 2 or later
; Note : All ini files need to be saved as UTF-8
@ -27,12 +27,10 @@ COM_PATCHTESTER_FIELD_REPO_LABEL="Dépôt GitHub"
COM_PATCHTESTER_FIELD_REPO_DESC="Nom du dépôt GitHub pour lequel les demandes de Pull seront effectuées"
COM_PATCHTESTER_FILE_DELETED_DOES_NOT_EXIST_S="Le fichier désigné pour la suppression n'existe pas : %s"
COM_PATCHTESTER_FILE_MODIFIED_DOES_NOT_EXIST_S="Le fichier désigné pour modification n'existe pas : %s"
COM_PATCHTESTER_JOOMLACODE_ISSUE="Référence JoomlaCode"
COM_PATCHTESTER_PULL_ID="ID de Pull"
COM_PATCHTESTER_NO_CREDENTIALS="Aucune information d'identification d'utilisateur n'est sauvegardée, ce qui autorise uniquement 60 requêtes par heure à l'API GitHub. La sauvegarde des informations d'identification utilisateur autorisera 5.000 requêtes par heure."
COM_PATCHTESTER_NOT_APPLIED="Non Appliqué"
COM_PATCHTESTER_OPEN_IN_GITHUB="Ouvrir dans GitHub"
COM_PATCHTESTER_OPEN_IN_JOOMLACODE="Ouvrir dans JoomlaCode"
COM_PATCHTESTER_PURGE_CACHE="Purger le Cache"
COM_PATCHTESTER_PURGE_FAIL="L'opération de nettoyage ne s'est pas déroulée avec succès, le fichier %s n'a pas été supprimé."
COM_PATCHTESTER_PURGE_FAIL_1="L'opération de nettoyage ne s'est pas déroulée avec succès, le fichier %s n'a pas été supprimé."

29
administrator/components/com_patchtester/models/pulls.php
View File

@ -125,8 +125,7 @@ class PatchtesterModelPulls extends JModelList
$search = $db->quote('%' . $db->escape($search, true) . '%');
$query->where(
'(' . $db->quoteName('a.title') . ' LIKE ' . $search . ') OR ' .
'(' . $db->quoteName('a.pull_id') . ' LIKE ' . $search . ') OR ' .
'(' . $db->quoteName('a.joomlacode_id') . ' LIKE ' . $search . ')'
'(' . $db->quoteName('a.pull_id') . ' LIKE ' . $search . ') OR '
);
}
@ -200,31 +199,7 @@ class PatchtesterModelPulls extends JModelList
$data->title = $pull->title;
$data->description = $pull->body;
$data->pull_url = $pull->html_url;
// Try to find a Joomlacode issue number
$matches = array();
preg_match('#\[\#([0-9]+)\]#', $pull->title, $matches);
if (isset($matches[1]))
{
$data->joomlacode_id = (int) $matches[1];
}
else
{
preg_match('#(http://joomlacode[-\w\./\?\S]+)#', $pull->body, $matches);
if (isset($matches[1]))
{
preg_match('#tracker_item_id=([0-9]+)#', $matches[1], $matches);
if (isset($matches[1]))
{
$data->joomlacode_id = (int) $matches[1];
}
}
}
try
{
$this->getDbo()->insertObject('#__patchtester_pulls', $data, 'id');

3
administrator/components/com_patchtester/views/pulls/tmpl/default.php
View File

@ -86,9 +86,6 @@ else :
<?php echo JText::_('JGLOBAL_TITLE'); ?>
</th>
<th class="nowrap center">I</th>
<th class="nowrap center">
<?php echo JText::_('COM_PATCHTESTER_JOOMLACODE_ISSUE'); ?>
</th>
<th width="20%" class="nowrap center">
<?php echo JText::_('JSTATUS'); ?>
</th>

9
administrator/components/com_patchtester/views/pulls/tmpl/default_items.php
View File

@ -34,15 +34,6 @@ foreach ($this->items as $i => $item) :
endif;
?>
</td>
<td>
<?php if ($item->joomlacode_id) :
$title = ' title="Open link::' . JText::_('COM_PATCHTESTER_OPEN_IN_JOOMLACODE') . '"';
echo '<a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=';
echo $item->joomlacode_id . '"' . $title . ' class="modal hasTip" rel="{handler: \'iframe\', size: {x: 900, y: 500}}">';
echo '[#' . $item->joomlacode_id . ']</a>';
endif; ?>
</td>
<td class="center">
<?php if ($item->applied) : ?>
<span class="label label-success">

3
administrator/templates/hathor/html/com_patchtester/pulls/default.php
View File

@ -47,9 +47,6 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" />
</th>
<th class="title nowrap center">I</th>
<th class="title nowrap center">
<?php echo JText::_('COM_PATCHTESTER_JOOMLACODE_ISSUE'); ?>
</th>
<th width="20%" class="title nowrap center">
<?php echo JText::_('JSTATUS'); ?>
</th>

15
administrator/templates/hathor/html/com_patchtester/pulls/default_items.php
View File

@ -35,21 +35,6 @@ foreach ($this->items as $i => $item) :
endif;
?>
</td>
<td class="center">
<?php if ($item->joomlacode_issue) :
$title = ' title="Open link::' . JText::_('COM_PATCHTESTER_OPEN_IN_JOOMLACODE') . '"';
if (is_int($item->joomlacode_issue)) :
echo '<a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=';
echo $item->joomlacode_issue . '"' . $title . ' class="modal hasTip" rel="{handler: \'iframe\', size: {x: 900, y: 500}}">';
echo '[#' . $item->joomlacode_issue . ']</a>';
else :
echo '<a href="' . $item->joomlacode_issue . '"' . $title;
echo ' class="modal hasTip" rel="{handler: \'iframe\', size: {x: 900, y: 500}}">';
echo '[#joomlacode]</a>';
endif;
endif; ?>
</td>
<td class="center">
<?php if ($patch && $patch->applied) : ?>
<span class="label label-success">