[ckan-changes] commit/ckanextiati: 2 new changesets

• Previous message: [ckan-changes] commit/ckanextiati: 2 new changesets
• Next message: [ckan-changes] [okfn/webstore] 91c8cb: Fix database lock error when altering table
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

2 new commits in ckanextiati:


https://bitbucket.org/okfn/ckanextiati/changeset/489075ac9f29/
changeset:   489075ac9f29
user:        amercader
date:        2011-11-11 18:09:04
summary:     [lists] Update codes for Kosovo (KX -> XK) and Europe (089 -> 89)
affected #:  1 file

diff -r 6f06265cd92fc5cd8a887fa5566e9a36f487f220 -r 489075ac9f2963ff36248151584a7016f272f142 ckanext/iati/countries.py
--- a/ckanext/iati/countries.py
+++ b/ckanext/iati/countries.py
@@ -3,4 +3,4 @@
 # This Python file uses the following encoding: utf-8
 # Country and regions names and codes sent by Bill Anderson on 2011-06-28
 
-COUNTRIES = (("", u"(No country assigned)"), ("AF",u"Afghanistan"),("AX",u"Åland Islands"),("AL",u"Albania"),("DZ",u"Algeria"),("AS",u"American Samoa"),("AD",u"Andorra"),("AO",u"Angola"),("AI",u"Anguilla"),("AQ",u"Antarctica"),("AG",u"Antigua And Barbuda"),("AR",u"Argentina"),("AM",u"Armenia"),("AW",u"Aruba"),("AU",u"Australia"),("AT",u"Austria"),("AZ",u"Azerbaijan"),("BS",u"Bahamas"),("BH",u"Bahrain"),("BD",u"Bangladesh"),("BB",u"Barbados"),("BY",u"Belarus"),("BE",u"Belgium"),("BZ",u"Belize"),("BJ",u"Benin"),("BM",u"Bermuda"),("BT",u"Bhutan"),("BO",u"Bolivia, Plurinational State Of"),("BQ",u"Bonaire, Sint Eustatius And Saba"),("BA",u"Bosnia And Herzegovina"),("BW",u"Botswana"),("BV",u"Bouvet Island"),("BR",u"Brazil"),("IO",u"British Indian Ocean Territory"),("BN",u"Brunei Darussalam"),("BG",u"Bulgaria"),("BF",u"Burkina Faso"),("BI",u"Burundi"),("KH",u"Cambodia"),("CM",u"Cameroon"),("CA",u"Canada"),("CV",u"Cape Verde"),("KY",u"Cayman Islands"),("CF",u"Central African Republic"),("TD",u"Chad"),("CL",u"Chile"),("CN",u"China"),("CX",u"Christmas Island"),("CC",u"Cocos (Keeling) Islands"),("CO",u"Colombia"),("KM",u"Comoros"),("CG",u"Congo"),("CD",u"Congo, The Democratic Republic Of The"),("CK",u"Cook Islands"),("CR",u"Costa Rica"),("CI",u"Côte D'Ivoire"),("HR",u"Croatia"),("CU",u"Cuba"),("CW",u"Curaçao"),("CY",u"Cyprus"),("CZ",u"Czech Republic"),("DK",u"Denmark"),("DJ",u"Djibouti"),("DM",u"Dominica"),("DO",u"Dominican Republic"),("EC",u"Ecuador"),("EG",u"Egypt"),("SV",u"El Salvador"),("GQ",u"Equatorial Guinea"),("ER",u"Eritrea"),("EE",u"Estonia"),("ET",u"Ethiopia"),("FK",u"Falkland Islands (Malvinas)"),("FO",u"Faroe Islands"),("FJ",u"Fiji"),("FI",u"Finland"),("FR",u"France"),("GF",u"French Guiana"),("PF",u"French Polynesia"),("TF",u"French Southern Territories"),("GA",u"Gabon"),("GM",u"Gambia"),("GE",u"Georgia"),("DE",u"Germany"),("GH",u"Ghana"),("GI",u"Gibraltar"),("GR",u"Greece"),("GL",u"Greenland"),("GD",u"Grenada"),("GP",u"Guadeloupe"),("GU",u"Guam"),("GT",u"Guatemala"),("GG",u"Guernsey"),("GN",u"Guinea"),("GW",u"Guinea-Bissau"),("GY",u"Guyana"),("HT",u"Haiti"),("HM",u"Heard Island And Mcdonald Islands"),("VA",u"Holy See (Vatican City State)"),("HN",u"Honduras"),("HK",u"Hong Kong"),("HU",u"Hungary"),("IS",u"Iceland"),("IN",u"India"),("ID",u"Indonesia"),("IR",u"Iran, Islamic Republic Of"),("IQ",u"Iraq"),("IE",u"Ireland"),("IM",u"Isle Of Man"),("IL",u"Israel"),("IT",u"Italy"),("JM",u"Jamaica"),("JP",u"Japan"),("JE",u"Jersey"),("JO",u"Jordan"),("KZ",u"Kazakhstan"),("KE",u"Kenya"),("KI",u"Kiribati"),("KP",u"Korea, Democratic People's Republic Of"),("KR",u"Korea, Republic Of"),("KX",u"Kosovo"),("KW",u"Kuwait"),("KG",u"Kyrgyzstan"),("LA",u"Lao People's Democratic Republic"),("LV",u"Latvia"),("LB",u"Lebanon"),("LS",u"Lesotho"),("LR",u"Liberia"),("LY",u"Libyan Arab Jamahiriya"),("LI",u"Liechtenstein"),("LT",u"Lithuania"),("LU",u"Luxembourg"),("MO",u"Macao"),("MK",u"Macedonia, The Former Yugoslav Republic Of"),("MG",u"Madagascar"),("MW",u"Malawi"),("MY",u"Malaysia"),("MV",u"Maldives"),("ML",u"Mali"),("MT",u"Malta"),("MH",u"Marshall Islands"),("MQ",u"Martinique"),("MR",u"Mauritania"),("MU",u"Mauritius"),("YT",u"Mayotte"),("MX",u"Mexico"),("FM",u"Micronesia, Federated States Of"),("MD",u"Moldova, Republic Of"),("MC",u"Monaco"),("MN",u"Mongolia"),("ME",u"Montenegro"),("MS",u"Montserrat"),("MA",u"Morocco"),("MZ",u"Mozambique"),("MM",u"Myanmar"),("NA",u"Namibia"),("NR",u"Nauru"),("NP",u"Nepal"),("NL",u"Netherlands"),("NC",u"New Caledonia"),("NZ",u"New Zealand"),("NI",u"Nicaragua"),("NE",u"Niger"),("NG",u"Nigeria"),("NU",u"Niue"),("NF",u"Norfolk Island"),("MP",u"Northern Mariana Islands"),("NO",u"Norway"),("OM",u"Oman"),("PK",u"Pakistan"),("PW",u"Palau"),("PS",u"Palestinian Territory, Occupied"),("PA",u"Panama"),("PG",u"Papua New Guinea"),("PY",u"Paraguay"),("PE",u"Peru"),("PH",u"Philippines"),("PN",u"Pitcairn"),("PL",u"Poland"),("PT",u"Portugal"),("PR",u"Puerto Rico"),("QA",u"Qatar"),("RE",u"Réunion"),("RO",u"Romania"),("RU",u"Russian Federation"),("RW",u"Rwanda"),("BL",u"Saint Barthélemy"),("SH",u"Saint Helena, Ascension And Tristan Da Cunha"),("KN",u"Saint Kitts And Nevis"),("LC",u"Saint Lucia"),("MF",u"Saint Martin (French Part)"),("PM",u"Saint Pierre And Miquelon"),("VC",u"Saint Vincent And The Grenadines"),("WS",u"Samoa"),("SM",u"San Marino"),("ST",u"Sao Tome And Principe"),("SA",u"Saudi Arabia"),("SN",u"Senegal"),("RS",u"Serbia"),("SC",u"Seychelles"),("SL",u"Sierra Leone"),("SG",u"Singapore"),("SX",u"Sint Maarten (Dutch Part)"),("SK",u"Slovakia"),("SI",u"Slovenia"),("SB",u"Solomon Islands"),("SO",u"Somalia"),("ZA",u"South Africa"),("GS",u"South Georgia And The South Sandwich Islands"),("ES",u"Spain"),("LK",u"Sri Lanka"),("SD",u"Sudan"),("SR",u"Suriname"),("SJ",u"Svalbard And Jan Mayen"),("SZ",u"Swaziland"),("SE",u"Sweden"),("CH",u"Switzerland"),("SY",u"Syrian Arab Republic"),("TW",u"Taiwan, Province Of China"),("TJ",u"Tajikistan"),("TZ",u"Tanzania, United Republic Of"),("TH",u"Thailand"),("TL",u"Timor-Leste"),("TG",u"Togo"),("TK",u"Tokelau"),("TO",u"Tonga"),("TT",u"Trinidad And Tobago"),("TN",u"Tunisia"),("TR",u"Turkey"),("TM",u"Turkmenistan"),("TC",u"Turks And Caicos Islands"),("TV",u"Tuvalu"),("UG",u"Uganda"),("UA",u"Ukraine"),("AE",u"United Arab Emirates"),("GB",u"United Kingdom"),("US",u"United States"),("UM",u"United States Minor Outlying Islands"),("UY",u"Uruguay"),("UZ",u"Uzbekistan"),("VU",u"Vanuatu"),("VE",u"Venezuela, Bolivarian Republic Of"),("VN",u"Viet Nam"),("VG",u"Virgin Islands, British"),("VI",u"Virgin Islands, U.S."),("WF",u"Wallis And Futuna"),("EH",u"Western Sahara"),("YE",u"Yemen"),("ZM",u"Zambia"),("ZW",u"Zimbabwe"),("298",u"Africa"),("189",u"Africa - North"),("289",u"Africa - Sub-Saharan"),("089",u"Europe"),("498",u"America"),("389",u"America - North & Central"),("489",u"America - South"),("380",u"West Indies"),("589",u"Middle East"),("798",u"Asia"),("619",u"Asia - Central"),("679",u"Asia - South"),("689",u"Asia - South & Central"),("789",u"Asia - Far East"),("889",u"Oceania"),("998",u"Unspecified"),)
+COUNTRIES = (("", u"(No country assigned)"), ("AF",u"Afghanistan"),("AX",u"Åland Islands"),("AL",u"Albania"),("DZ",u"Algeria"),("AS",u"American Samoa"),("AD",u"Andorra"),("AO",u"Angola"),("AI",u"Anguilla"),("AQ",u"Antarctica"),("AG",u"Antigua And Barbuda"),("AR",u"Argentina"),("AM",u"Armenia"),("AW",u"Aruba"),("AU",u"Australia"),("AT",u"Austria"),("AZ",u"Azerbaijan"),("BS",u"Bahamas"),("BH",u"Bahrain"),("BD",u"Bangladesh"),("BB",u"Barbados"),("BY",u"Belarus"),("BE",u"Belgium"),("BZ",u"Belize"),("BJ",u"Benin"),("BM",u"Bermuda"),("BT",u"Bhutan"),("BO",u"Bolivia, Plurinational State Of"),("BQ",u"Bonaire, Sint Eustatius And Saba"),("BA",u"Bosnia And Herzegovina"),("BW",u"Botswana"),("BV",u"Bouvet Island"),("BR",u"Brazil"),("IO",u"British Indian Ocean Territory"),("BN",u"Brunei Darussalam"),("BG",u"Bulgaria"),("BF",u"Burkina Faso"),("BI",u"Burundi"),("KH",u"Cambodia"),("CM",u"Cameroon"),("CA",u"Canada"),("CV",u"Cape Verde"),("KY",u"Cayman Islands"),("CF",u"Central African Republic"),("TD",u"Chad"),("CL",u"Chile"),("CN",u"China"),("CX",u"Christmas Island"),("CC",u"Cocos (Keeling) Islands"),("CO",u"Colombia"),("KM",u"Comoros"),("CG",u"Congo"),("CD",u"Congo, The Democratic Republic Of The"),("CK",u"Cook Islands"),("CR",u"Costa Rica"),("CI",u"Côte D'Ivoire"),("HR",u"Croatia"),("CU",u"Cuba"),("CW",u"Curaçao"),("CY",u"Cyprus"),("CZ",u"Czech Republic"),("DK",u"Denmark"),("DJ",u"Djibouti"),("DM",u"Dominica"),("DO",u"Dominican Republic"),("EC",u"Ecuador"),("EG",u"Egypt"),("SV",u"El Salvador"),("GQ",u"Equatorial Guinea"),("ER",u"Eritrea"),("EE",u"Estonia"),("ET",u"Ethiopia"),("FK",u"Falkland Islands (Malvinas)"),("FO",u"Faroe Islands"),("FJ",u"Fiji"),("FI",u"Finland"),("FR",u"France"),("GF",u"French Guiana"),("PF",u"French Polynesia"),("TF",u"French Southern Territories"),("GA",u"Gabon"),("GM",u"Gambia"),("GE",u"Georgia"),("DE",u"Germany"),("GH",u"Ghana"),("GI",u"Gibraltar"),("GR",u"Greece"),("GL",u"Greenland"),("GD",u"Grenada"),("GP",u"Guadeloupe"),("GU",u"Guam"),("GT",u"Guatemala"),("GG",u"Guernsey"),("GN",u"Guinea"),("GW",u"Guinea-Bissau"),("GY",u"Guyana"),("HT",u"Haiti"),("HM",u"Heard Island And Mcdonald Islands"),("VA",u"Holy See (Vatican City State)"),("HN",u"Honduras"),("HK",u"Hong Kong"),("HU",u"Hungary"),("IS",u"Iceland"),("IN",u"India"),("ID",u"Indonesia"),("IR",u"Iran, Islamic Republic Of"),("IQ",u"Iraq"),("IE",u"Ireland"),("IM",u"Isle Of Man"),("IL",u"Israel"),("IT",u"Italy"),("JM",u"Jamaica"),("JP",u"Japan"),("JE",u"Jersey"),("JO",u"Jordan"),("KZ",u"Kazakhstan"),("KE",u"Kenya"),("KI",u"Kiribati"),("KP",u"Korea, Democratic People's Republic Of"),("KR",u"Korea, Republic Of"),("XK",u"Kosovo"),("KW",u"Kuwait"),("KG",u"Kyrgyzstan"),("LA",u"Lao People's Democratic Republic"),("LV",u"Latvia"),("LB",u"Lebanon"),("LS",u"Lesotho"),("LR",u"Liberia"),("LY",u"Libyan Arab Jamahiriya"),("LI",u"Liechtenstein"),("LT",u"Lithuania"),("LU",u"Luxembourg"),("MO",u"Macao"),("MK",u"Macedonia, The Former Yugoslav Republic Of"),("MG",u"Madagascar"),("MW",u"Malawi"),("MY",u"Malaysia"),("MV",u"Maldives"),("ML",u"Mali"),("MT",u"Malta"),("MH",u"Marshall Islands"),("MQ",u"Martinique"),("MR",u"Mauritania"),("MU",u"Mauritius"),("YT",u"Mayotte"),("MX",u"Mexico"),("FM",u"Micronesia, Federated States Of"),("MD",u"Moldova, Republic Of"),("MC",u"Monaco"),("MN",u"Mongolia"),("ME",u"Montenegro"),("MS",u"Montserrat"),("MA",u"Morocco"),("MZ",u"Mozambique"),("MM",u"Myanmar"),("NA",u"Namibia"),("NR",u"Nauru"),("NP",u"Nepal"),("NL",u"Netherlands"),("NC",u"New Caledonia"),("NZ",u"New Zealand"),("NI",u"Nicaragua"),("NE",u"Niger"),("NG",u"Nigeria"),("NU",u"Niue"),("NF",u"Norfolk Island"),("MP",u"Northern Mariana Islands"),("NO",u"Norway"),("OM",u"Oman"),("PK",u"Pakistan"),("PW",u"Palau"),("PS",u"Palestinian Territory, Occupied"),("PA",u"Panama"),("PG",u"Papua New Guinea"),("PY",u"Paraguay"),("PE",u"Peru"),("PH",u"Philippines"),("PN",u"Pitcairn"),("PL",u"Poland"),("PT",u"Portugal"),("PR",u"Puerto Rico"),("QA",u"Qatar"),("RE",u"Réunion"),("RO",u"Romania"),("RU",u"Russian Federation"),("RW",u"Rwanda"),("BL",u"Saint Barthélemy"),("SH",u"Saint Helena, Ascension And Tristan Da Cunha"),("KN",u"Saint Kitts And Nevis"),("LC",u"Saint Lucia"),("MF",u"Saint Martin (French Part)"),("PM",u"Saint Pierre And Miquelon"),("VC",u"Saint Vincent And The Grenadines"),("WS",u"Samoa"),("SM",u"San Marino"),("ST",u"Sao Tome And Principe"),("SA",u"Saudi Arabia"),("SN",u"Senegal"),("RS",u"Serbia"),("SC",u"Seychelles"),("SL",u"Sierra Leone"),("SG",u"Singapore"),("SX",u"Sint Maarten (Dutch Part)"),("SK",u"Slovakia"),("SI",u"Slovenia"),("SB",u"Solomon Islands"),("SO",u"Somalia"),("ZA",u"South Africa"),("GS",u"South Georgia And The South Sandwich Islands"),("ES",u"Spain"),("LK",u"Sri Lanka"),("SD",u"Sudan"),("SR",u"Suriname"),("SJ",u"Svalbard And Jan Mayen"),("SZ",u"Swaziland"),("SE",u"Sweden"),("CH",u"Switzerland"),("SY",u"Syrian Arab Republic"),("TW",u"Taiwan, Province Of China"),("TJ",u"Tajikistan"),("TZ",u"Tanzania, United Republic Of"),("TH",u"Thailand"),("TL",u"Timor-Leste"),("TG",u"Togo"),("TK",u"Tokelau"),("TO",u"Tonga"),("TT",u"Trinidad And Tobago"),("TN",u"Tunisia"),("TR",u"Turkey"),("TM",u"Turkmenistan"),("TC",u"Turks And Caicos Islands"),("TV",u"Tuvalu"),("UG",u"Uganda"),("UA",u"Ukraine"),("AE",u"United Arab Emirates"),("GB",u"United Kingdom"),("US",u"United States"),("UM",u"United States Minor Outlying Islands"),("UY",u"Uruguay"),("UZ",u"Uzbekistan"),("VU",u"Vanuatu"),("VE",u"Venezuela, Bolivarian Republic Of"),("VN",u"Viet Nam"),("VG",u"Virgin Islands, British"),("VI",u"Virgin Islands, U.S."),("WF",u"Wallis And Futuna"),("EH",u"Western Sahara"),("YE",u"Yemen"),("ZM",u"Zambia"),("ZW",u"Zimbabwe"),("298",u"Africa"),("189",u"Africa - North"),("289",u"Africa - Sub-Saharan"),("89",u"Europe"),("498",u"America"),("389",u"America - North & Central"),("489",u"America - South"),("380",u"West Indies"),("589",u"Middle East"),("798",u"Asia"),("619",u"Asia - Central"),("679",u"Asia - South"),("689",u"Asia - South & Central"),("789",u"Asia - Far East"),("889",u"Oceania"),("998",u"Unspecified"),)



https://bitbucket.org/okfn/ckanextiati/changeset/95edb354c8d9/
changeset:   95edb354c8d9
user:        amercader
date:        2011-11-11 18:10:34
summary:     [ui] Hide publisher details in authz page
affected #:  2 files

diff -r 489075ac9f2963ff36248151584a7016f272f142 -r 95edb354c8d9669481e0437a9be023d27d46fb97 ckanext/iati/controllers/group_iati.py
--- a/ckanext/iati/controllers/group_iati.py
+++ b/ckanext/iati/controllers/group_iati.py
@@ -25,9 +25,6 @@
         c.publisher_source_types = PUBLISHER_SOURCE_TYPES
         c.countries = [(v, k) for k, v in COUNTRIES]
 
-        c.show_publisher_info = not (request.environ['pylons.routes_dict']['action'] == 'authz')
-
-
     def _form_to_db_schema(self):
         schema = group_form_schema()
         schema.update({


diff -r 489075ac9f2963ff36248151584a7016f272f142 -r 95edb354c8d9669481e0437a9be023d27d46fb97 ckanext/iati/templates/group/layout.html
--- a/ckanext/iati/templates/group/layout.html
+++ b/ckanext/iati/templates/group/layout.html
@@ -41,8 +41,7 @@
       </p></div>
-
-    <div py:if="c.group and c.show_publisher_info" class="box" id="publisher-info">
+    <div py:if="c.group and c.action != 'authz'" class="box" id="publisher-info"><h2>About this publisher</h2>

Repository URL: https://bitbucket.org/okfn/ckanextiati/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

• Previous message: [ckan-changes] commit/ckanextiati: 2 new changesets
• Next message: [ckan-changes] [okfn/webstore] 91c8cb: Fix database lock error when altering table
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]