diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-11-16 05:26:39 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-11-16 05:26:39 (GMT) |
commit | 5fc1beddaa4e7cbdff6375dcd623104422a5e87a (patch) | |
tree | 48dafcd4c31915a0de5e27e44e504f20c276a001 | |
parent | e73ad835768240402268a17686b901aee55498a2 (diff) |
who released activity version X? #1539
45 files changed, 144 insertions, 3 deletions
diff --git a/aslo/po/af.po b/aslo/po/af.po index 8bbfd7f..82df779 100644 --- a/aslo/po/af.po +++ b/aslo/po/af.po @@ -4320,3 +4320,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/ar.po b/aslo/po/ar.po index 0b2607c..f1ab586 100644 --- a/aslo/po/ar.po +++ b/aslo/po/ar.po @@ -4185,3 +4185,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/ca.po b/aslo/po/ca.po index 7f52182..900039a 100644 --- a/aslo/po/ca.po +++ b/aslo/po/ca.po @@ -4105,3 +4105,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/cs.po b/aslo/po/cs.po index 05e1c3b..5c21e1f 100644 --- a/aslo/po/cs.po +++ b/aslo/po/cs.po @@ -3986,3 +3986,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/cy.po b/aslo/po/cy.po index 86ccc5c..d4c3846 100644 --- a/aslo/po/cy.po +++ b/aslo/po/cy.po @@ -4226,3 +4226,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/da.po b/aslo/po/da.po index 33cc69e..c973558 100644 --- a/aslo/po/da.po +++ b/aslo/po/da.po @@ -4030,3 +4030,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/de.po b/aslo/po/de.po index e21841d..3785d11 100644 --- a/aslo/po/de.po +++ b/aslo/po/de.po @@ -4303,3 +4303,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/el.po b/aslo/po/el.po index 29f1f59..7854444 100644 --- a/aslo/po/el.po +++ b/aslo/po/el.po @@ -3243,3 +3243,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/en.po b/aslo/po/en.po index 49a49f2..bff02a4 100644 --- a/aslo/po/en.po +++ b/aslo/po/en.po @@ -3591,3 +3591,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/es_ES.po b/aslo/po/es_ES.po index 6cd3886..eab850b 100644 --- a/aslo/po/es_ES.po +++ b/aslo/po/es_ES.po @@ -4090,3 +4090,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/eu.po b/aslo/po/eu.po index c21726b..9ea8b77 100644 --- a/aslo/po/eu.po +++ b/aslo/po/eu.po @@ -4273,3 +4273,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/fa.po b/aslo/po/fa.po index acec596..6d9969f 100644 --- a/aslo/po/fa.po +++ b/aslo/po/fa.po @@ -4056,3 +4056,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/fi.po b/aslo/po/fi.po index e3a6a26..128fcb1 100644 --- a/aslo/po/fi.po +++ b/aslo/po/fi.po @@ -4243,3 +4243,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/fr.po b/aslo/po/fr.po index 06bfe2e..ab757f5 100644 --- a/aslo/po/fr.po +++ b/aslo/po/fr.po @@ -4140,3 +4140,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/fy_NL.po b/aslo/po/fy_NL.po index d9e4e32..6897638 100644 --- a/aslo/po/fy_NL.po +++ b/aslo/po/fy_NL.po @@ -4351,3 +4351,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/ga_IE.po b/aslo/po/ga_IE.po index 8bc4dc5..17d3c80 100644 --- a/aslo/po/ga_IE.po +++ b/aslo/po/ga_IE.po @@ -3692,3 +3692,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/he.po b/aslo/po/he.po index a3decde..6f224ff 100644 --- a/aslo/po/he.po +++ b/aslo/po/he.po @@ -4160,3 +4160,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/hu.po b/aslo/po/hu.po index e97851a..5a1d924 100644 --- a/aslo/po/hu.po +++ b/aslo/po/hu.po @@ -4037,3 +4037,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/id.po b/aslo/po/id.po index acbb43c..0af7ce6 100644 --- a/aslo/po/id.po +++ b/aslo/po/id.po @@ -4161,3 +4161,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/it.po b/aslo/po/it.po index 6e76dd5..f1628c2 100644 --- a/aslo/po/it.po +++ b/aslo/po/it.po @@ -4143,3 +4143,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/ja.po b/aslo/po/ja.po index 7077705..f0b6f59 100644 --- a/aslo/po/ja.po +++ b/aslo/po/ja.po @@ -4026,3 +4026,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/ko.po b/aslo/po/ko.po index ae791d9..f08b941 100644 --- a/aslo/po/ko.po +++ b/aslo/po/ko.po @@ -3980,3 +3980,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/mn.po b/aslo/po/mn.po index cdac7d3..060cbbb 100644 --- a/aslo/po/mn.po +++ b/aslo/po/mn.po @@ -4233,3 +4233,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/nl.po b/aslo/po/nl.po index 5b949fc..9a7932b 100644 --- a/aslo/po/nl.po +++ b/aslo/po/nl.po @@ -4113,3 +4113,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/pl.po b/aslo/po/pl.po index 36cb692..d64be98 100644 --- a/aslo/po/pl.po +++ b/aslo/po/pl.po @@ -3241,3 +3241,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/pt_BR.po b/aslo/po/pt_BR.po index 5300120..0514229 100644 --- a/aslo/po/pt_BR.po +++ b/aslo/po/pt_BR.po @@ -4090,3 +4090,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/pt_PT.po b/aslo/po/pt_PT.po index cbb75eb..2b45dad 100644 --- a/aslo/po/pt_PT.po +++ b/aslo/po/pt_PT.po @@ -3201,3 +3201,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/ro.po b/aslo/po/ro.po index 8e24ea6..9f9f2af 100644 --- a/aslo/po/ro.po +++ b/aslo/po/ro.po @@ -3888,3 +3888,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/ru.po b/aslo/po/ru.po index f19fd20..a441878 100644 --- a/aslo/po/ru.po +++ b/aslo/po/ru.po @@ -4094,3 +4094,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/sk.po b/aslo/po/sk.po index 6d87689..67e2913 100644 --- a/aslo/po/sk.po +++ b/aslo/po/sk.po @@ -3252,3 +3252,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/sq.po b/aslo/po/sq.po index 36c0790..355e249 100644 --- a/aslo/po/sq.po +++ b/aslo/po/sq.po @@ -4077,3 +4077,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/sr-Latn.po b/aslo/po/sr-Latn.po index 20f5645..c8da186 100644 --- a/aslo/po/sr-Latn.po +++ b/aslo/po/sr-Latn.po @@ -4275,3 +4275,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/sr.po b/aslo/po/sr.po index 4ae86a3..58e9c90 100644 --- a/aslo/po/sr.po +++ b/aslo/po/sr.po @@ -3926,3 +3926,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/sv_SE.po b/aslo/po/sv_SE.po index f035268..d97be33 100644 --- a/aslo/po/sv_SE.po +++ b/aslo/po/sv_SE.po @@ -4035,3 +4035,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/tr.po b/aslo/po/tr.po index 9ddb1a2..660ab81 100644 --- a/aslo/po/tr.po +++ b/aslo/po/tr.po @@ -4332,3 +4332,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/uk.po b/aslo/po/uk.po index 46fc43b..8523196 100644 --- a/aslo/po/uk.po +++ b/aslo/po/uk.po @@ -3892,3 +3892,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/vi.po b/aslo/po/vi.po index 4eeb1b3..6da0d8a 100644 --- a/aslo/po/vi.po +++ b/aslo/po/vi.po @@ -4068,3 +4068,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/zh_CN.po b/aslo/po/zh_CN.po index 036023d..6840463 100644 --- a/aslo/po/zh_CN.po +++ b/aslo/po/zh_CN.po @@ -3874,3 +3874,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/po/zh_TW.po b/aslo/po/zh_TW.po index 2fc475e..0c13314 100644 --- a/aslo/po/zh_TW.po +++ b/aslo/po/zh_TW.po @@ -3801,3 +3801,6 @@ msgstr "" msgctxt "devcp_js_upload_badfilename" msgid "Bad filename received. Files must be of type .xpi, .xml, or .jar" msgstr "Bad filename received. Files must be of type .xo" + +msgid "Uploader" +msgstr "" diff --git a/aslo/sql/sugar-stub-data.sql b/aslo/sql/sugar-stub-data.sql index 1f8ca38..5f620f4 100644 --- a/aslo/sql/sugar-stub-data.sql +++ b/aslo/sql/sugar-stub-data.sql @@ -15,7 +15,7 @@ INSERT INTO `groups_users` (`group_id`, `user_id`) VALUES -- Add root@sugarlabs.org user with password "test" DELETE from `users`; INSERT INTO `users` (`id`, `email`, `password`, `firstname`, `lastname`, `nickname`, `emailhidden`, `sandboxshown`, `homepage`, `confirmationcode`, `created`, `modified`, `notes`) VALUES -(1, 'nobody@addons.mozilla.org', '098f6bcd4621d373cade4e832627b4f6', 'nobody', 'nobody', 'nobody', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL), +(1, 'nobody@addons.mozilla.org', '098f6bcd4621d373cade4e832627b4f6', 'no', 'no', 'no', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL), (2, 'admin@sugarlabs.org', '098f6bcd4621d373cade4e832627b4f6', 'root', 'root', 'root', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL), (3, 'editor@sugarlabs.org', '098f6bcd4621d373cade4e832627b4f6', 'editor', 'editor', 'editor', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL), (4, 'developer@sugarlabs.org', '098f6bcd4621d373cade4e832627b4f6', 'developer', 'developer', 'developer', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL), @@ -106,4 +106,7 @@ INSERT INTO `facebook_data` (trait) VALUES DELETE FROM `translations_seq`; INSERT INTO `translations_seq` (id) values (1000); +INSERT INTO `users` (`id`, `email`, `password`, `firstname`, `lastname`, `nickname`, `emailhidden`, `sandboxshown`, `homepage`, `confirmationcode`, `created`, `modified`, `notes`) VALUES +(0, 'nobody@sugarlabs.org', '098f6bcd4621d373cade4e832627b4f6', 'nobody', 'nobody', 'nobody', 0, 1, 'http://wiki.sugarlabs.org', '', now(), now(), NULL); + SET FOREIGN_KEY_CHECKS=1; diff --git a/aslo/sql/sugar-stub.sql b/aslo/sql/sugar-stub.sql index 322b2e2..94770cf 100644 --- a/aslo/sql/sugar-stub.sql +++ b/aslo/sql/sugar-stub.sql @@ -1,6 +1,8 @@ SET FOREIGN_KEY_CHECKS=0; ALTER TABLE versions - ADD COLUMN `in_reply_to` varchar(255) NOT NULL default ''; + ADD COLUMN `in_reply_to` varchar(255) NOT NULL default '', + ADD COLUMN `uploader` int(11) unsigned NOT NULL default '0', + ADD CONSTRAINT `versions_ibfk_uploader` FOREIGN KEY (`uploader`) REFERENCES `users` (`id`); SET FOREIGN_KEY_CHECKS=1; diff --git a/site/app/controllers/addons_controller.php b/site/app/controllers/addons_controller.php index 16de817..6d2b573 100644 --- a/site/app/controllers/addons_controller.php +++ b/site/app/controllers/addons_controller.php @@ -1599,6 +1599,8 @@ class AddonsController extends AppController for($i =0 ; $i < count($versions); $i++) { $versions[$i]['Compatibility'] = $comp_apps_by_id[$versions[$i]['Version']['id'] ]; + $user = $this->User->findById($versions[$i]['Version']['uploader']); + $versions[$i]['User'] = $user['User']; } } else diff --git a/site/app/controllers/developers_controller.php b/site/app/controllers/developers_controller.php index 201c497..191144d 100644 --- a/site/app/controllers/developers_controller.php +++ b/site/app/controllers/developers_controller.php @@ -405,6 +405,8 @@ class DevelopersController extends AppController $this->Version->id = 0; $data['Version']['addon_id'] = $addon_id; $data['Version']['license_id'] = $license_id; + $session_user = $this->Session->read('User'); + $data['Version']['uploader'] = $session_user['id']; $this->Version->save($data['Version']); $version_id = $this->Version->getLastInsertId(); diff --git a/site/app/views/addons/versions.thtml b/site/app/views/addons/versions.thtml index e3df3d2..a543393 100644 --- a/site/app/views/addons/versions.thtml +++ b/site/app/views/addons/versions.thtml @@ -91,7 +91,7 @@ $addonIconPath = $this->controller->Image->getAddonIconURL($addon['Addon']['id'] 'is_latest' => false ))?> <h3><?=$this->renderElement('amo2009/addons/version_detail', $_version_data)?></h3> - + <?=$this->renderElement('uploader', array('version' => $version)); ?> <?=$this->renderElement('app_compatibility', array('compatible_apps' => $version['Compatibility'])); ?> <p<?=$version['Translation']['releasenotes']['locale_html']?>> diff --git a/site/app/views/elements/uploader.thtml b/site/app/views/elements/uploader.thtml new file mode 100644 index 0000000..ad27e53 --- /dev/null +++ b/site/app/views/elements/uploader.thtml @@ -0,0 +1,15 @@ +<?php + +/** + * This element uses the following local variables: + * - version + */ + + +?> +<div class="uploader"> + <h5><?=___('Uploader')?>:</h5> + <ul> + <?= $html->linkUserFromModel($version['User']); ?> + </ul> +</div> |