Skip to content

Commit 8854f7d

Browse files
committed
Bump version 1.3.0
1 parent 156aca8 commit 8854f7d

File tree

6 files changed

+71
-10
lines changed

6 files changed

+71
-10
lines changed

Diff for: _build/build.transport.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/* define package */
1515
define('PKG_NAME','Tagger');
1616
define('PKG_NAME_LOWER',strtolower(PKG_NAME));
17-
define('PKG_VERSION','1.2.0');
17+
define('PKG_VERSION','1.3.0');
1818
define('PKG_RELEASE','pl');
1919

2020
/* define sources */
@@ -122,6 +122,9 @@
122122
$vehicle->resolve('php',array(
123123
'source' => $sources['resolvers'] . 'resolve.tables.php',
124124
));
125+
$vehicle->resolve('php',array(
126+
'source' => $sources['resolvers'] . 'resolve.settings.php',
127+
));
125128
$builder->putVehicle($vehicle);
126129

127130
/* Settings */

Diff for: _build/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"lowCaseName": "tagger",
44
"description": "Tag management component",
55
"author": "John Peca",
6-
"version": "1.2.0",
6+
"version": "1.3.0",
77
"package":{
88
"actions": [{
99
"id": 1

Diff for: _build/data/transport.settings.php

-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
*/
88
$settings = array();
99

10-
$settings['tagger.tag_key'] = $modx->newObject('modSystemSetting');
11-
$settings['tagger.tag_key']->set('key', 'tagger.tag_key');
12-
$settings['tagger.tag_key']->fromArray(array(
13-
'value' => 'tags',
14-
'xtype' => 'textfield',
15-
'namespace' => 'tagger',
16-
));
17-
1810
$settings['tagger.place_above_content_header'] = $modx->newObject('modSystemSetting');
1911
$settings['tagger.place_above_content_header']->set('key', 'tagger.place_above_content_header');
2012
$settings['tagger.place_above_content_header']->fromArray(array(

Diff for: _build/resolvers/resolve.settings.php

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
if ($object->xpdo) {
3+
switch ($options[xPDOTransport::PACKAGE_ACTION]) {
4+
case xPDOTransport::ACTION_UPGRADE:
5+
/** @var modX $modx */
6+
$modx =& $object->xpdo;
7+
8+
$tagKey = $modx->getObject('modSystemSetting', array('key' => 'tagger.tag_key'));
9+
if ($tagKey) {
10+
$tagKey->remove();
11+
}
12+
break;
13+
}
14+
}
15+
return true;

Diff for: _build/resolvers/resolve.tables.php

+49
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,55 @@
1515

1616
break;
1717
case xPDOTransport::ACTION_UPGRADE:
18+
/** @var modX $modx */
19+
$modx =& $object->xpdo;
20+
21+
// http://forums.modx.com/thread/88734/package-version-check#dis-post-489104
22+
$c = $modx->newQuery('transport.modTransportPackage');
23+
$c->where(array(
24+
'workspace' => 1,
25+
"(SELECT
26+
`signature`
27+
FROM {$modx->getTableName('modTransportPackage')} AS `latestPackage`
28+
WHERE `latestPackage`.`package_name` = `modTransportPackage`.`package_name`
29+
ORDER BY
30+
`latestPackage`.`version_major` DESC,
31+
`latestPackage`.`version_minor` DESC,
32+
`latestPackage`.`version_patch` DESC,
33+
IF(`release` = '' OR `release` = 'ga' OR `release` = 'pl','z',`release`) DESC,
34+
`latestPackage`.`release_index` DESC
35+
LIMIT 1,1) = `modTransportPackage`.`signature`",
36+
));
37+
$c->where(array(
38+
'modTransportPackage.package_name' => 'tagger',
39+
'installed:IS NOT' => null
40+
));
41+
42+
/** @var modTransportPackage $oldPackage */
43+
$oldPackage = $modx->getObject('transport.modTransportPackage', $c);
44+
45+
$modelPath = $modx->getOption('tagger.core_path',null,$modx->getOption('core_path').'components/tagger/').'model/';
46+
$modx->addPackage('tagger',$modelPath);
47+
48+
if ($oldPackage && $oldPackage->compareVersion('1.3.0-pl', '>')) {
49+
$manager = $modx->getManager();
50+
$manager->addField('TaggerGroup', 'alias');
51+
$manager->addField('TaggerGroup', 'hide_input');
52+
$manager->addField('TaggerGroup', 'tag_limit');
53+
54+
$manager->addField('TaggerTag', 'alias');
55+
56+
$tags = $modx->getCollection('TaggerTag', array('alias' => ''));
57+
foreach ($tags as $tag) {
58+
$tag->save();
59+
}
60+
61+
$groups = $modx->getCollection('TaggerGroup', array('alias' => ''));
62+
foreach ($groups as $group) {
63+
$group->save();
64+
}
65+
}
66+
1867
break;
1968
}
2069
}

Diff for: core/components/tagger/docs/changelog.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Changelog for Tagger.
22

3+
Tagger 1.3.0
4+
==============
35
- Fixed bug that removed all assigned tags on second resource's save
46
- Added alias field to groups
57
- Added alias field to tags

0 commit comments

Comments
 (0)