[Widelands-dev] [Merge] lp:~widelands-dev/widelands/per-level-soldier-anims into lp:widelands
Continuous integration builds have changed state: Travis build 3983. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/428932833. Appveyor build 3781. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_per_level_soldier_anims-3781. -- https://code.launchpad.net/~widelands-dev/widelands/per-level-soldier-anims/+merge/354929 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/per-level-soldier-anims into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3981. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/428918967. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
Sorry, I wasn't able to work on this the last days. Your solution looks good, though, thanks! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3977. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/428723984. -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/354019 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling_2. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website
Review: Needs Fixing Just found that it is still possible to write a PM to a deleted user, if the recipient is written by hand in the recipient field. When the DELETED_USER_MAILADDRESS is empty an email isn't sent, but there is no error message shown to the user. -- https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
hessenfarmer has proposed merging
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.
Commit message:
fixes bug 1792297
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1792297 in widelands: "Advanced buildings report wrong worker experience
in the encyclopedia"
https://bugs.launchpad.net/widelands/+bug/1792297
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
correct experience levels are displayed for the workers in the building help.
all possible working places for workers are listed including positions of lower
experienced workers
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.
=== modified file 'data/tribes/scripting/help/building_help.lua'
--- data/tribes/scripting/help/building_help.lua 2018-09-12 19:51:07 +
+++ data/tribes/scripting/help/building_help.lua 2018-09-15 16:11:36 +
@@ -666,6 +666,9 @@
end
end
+ worker_description = building_description.working_positions[1]
+ becomes_description = worker_description.becomes
+
if (becomes_description) then
result = result .. help_worker_experience(worker_description, becomes_description)
end
=== modified file 'data/tribes/scripting/help/worker_help.lua'
--- data/tribes/scripting/help/worker_help.lua 2017-12-07 08:17:40 +
+++ data/tribes/scripting/help/worker_help.lua 2018-09-15 16:11:36 +
@@ -97,15 +97,37 @@
--
function worker_help_employers_string(worker_description)
local result = ""
- local employers = worker_description.employers;
- if (#employers > 0) then
+ if (#worker_description.employers > 0) then
-- TRANSLATORS: Worker Encyclopedia: A list of buildings where a worker can work
-- TRANSLATORS: You can also translate this as 'workplace(s)'
- result = result .. h2(ngettext("Works at", "Works at", #employers))
+ result = result .. h2(ngettext("Works at", "Works at", #worker_description.employers))
for i, building in ipairs(worker_description.employers) do
result = result .. dependencies({worker_description, building}, building.descname)
end
+ building = worker_description.employers[1]
+ if #building.working_positions > 1 and worker_description.descname == building.working_positions[2].descname and worker_description.descname ~= building.working_positions[1].descname then
+for i, build in ipairs(building.working_positions[1].employers) do
+ if not build.working_positions[2] then
+ -- TRANSLATORS: this text should describe that a more expereinced worker can be a substitute for a less experienced worker
+ result = result .. dependencies({worker_description, build}, build.descname .. _" (instead of " .. build.working_positions[1].descname .. ")")
+ end
+end
+ elseif #building.working_positions > 2 and worker_description.descname == building.working_positions[3].descname then
+for i, build in ipairs(building.working_positions[1].employers) do
+ if #build.working_positions > 1 and not build.working_positions[3] then
+ -- TRANSLATORS: This text should describe that a level 3 worker can be a substitute for a level 2 worker or a level 1 worker
+ result = result .. dependencies({worker_description, build}, build.descname .. _" (instead of " .. build.working_positions[2].descname .. " or " .. build.working_positions[1].descname .. ")")
+ end
+end
+for i, build in ipairs(building.working_positions[1].employers) do
+ if not build.working_positions[2] then
+ -- TRANSLATORS: this text should describe that a more expereinced worker can be a substitute for a less experienced worker
+ result = result .. dependencies({worker_description, build}, build.descname .. _" (instead of " .. build.working_positions[1].descname .. ")")
+ end
+end
+ end
+ -- end
end
return result
end
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands
Continuous integration builds have changed state: Travis build 3974. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/428601743. Appveyor build 3772. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1751440_smugglers_desync_single_coroutine-3772. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire03_improve into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/empire03_improve into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/empire03_improve/+merge/354920 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire03_improve. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire03_improve into lp:widelands
Continuous integration builds have changed state: Travis build 3973. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/428600771. Appveyor build 3771. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_empire03_improve-3771. -- https://code.launchpad.net/~widelands-dev/widelands/empire03_improve/+merge/354920 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire03_improve. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website has been updated. Commit message changed to: Make it possible to 'delete a user by himself, which means clean his data and show 'Deleted' in every place where a username is shown. For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/delete_user
into lp:widelands-website.
Commit message:
Make it possible to 'delete a user, which means clean his data and show
'Deleted' in every place where a username is shown.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1790307 in Widelands Website: "Make it possible to 'delete' a user"
https://bugs.launchpad.net/widelands-website/+bug/1790307
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/delete_user/+merge/354978
Added a link in the edit profile page which switch to a page showing what
deletion means. After clicking on 'I am sure, delete me', the following changes
are made:
- Log the user immediately out
- Delete possible playtime scheduling dates
- Delete the Online Gaming Password
- Clean the users profile page, including physically deleting his current image
of avatar
- Deactivate all subscriptions for this user
- Put all his PMs in the users trash
- Set the user inactive, also set 'is_staff' and 'is_superuser' to false
- Set the users E-Mail to the value of settings.DELETED_MAIL_ADDRESS
- Show the value of settings.DELETED_USERNAME in all places where a username is
shown on the website. Wehen hovering over such a name a tooltip is shown saying
'This user has left our community'
- Prevent sending PMs to a deleted user
- Prevent showing the users profile by directly typing the url in the browsers
addressbar
The decision when to show the DELETED_USERNAME is done by comparing the value
of the new boolean field 'deleted' in the model wlprofile.Profile. I have added
this new field because other comparisons (e.g. against 'is_staff' or the
anonymized Email address) seems a bit iffy to me.
What username should shown for a deleted user? Currently this is 'Deleted', if
we want another name it should be consistent with the username rules, which
means it should contain only alphanumeric, _, @, +, . and - characters.
Just found that the DELETED_USER_MAILADDRESS can also be an empty value. I will
set it to an empty string then.
Additional cleanup:
- Removed unused functions for feeds
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/delete_user into lp:widelands-website.
=== modified file 'django_messages_wl/views.py'
--- django_messages_wl/views.py 2018-04-18 12:04:12 +
+++ django_messages_wl/views.py 2018-09-15 07:44:50 +
@@ -15,7 +15,7 @@
if request.is_ajax():
q = request.GET.get('term', '')
-usernames = User.objects.filter(username__icontains=q)
+usernames = User.objects.exclude(is_active=False).filter(username__icontains=q)
results = []
for user in usernames:
name_json = {'value': user.username}
=== modified file 'news/feeds.py'
--- news/feeds.py 2018-04-08 14:40:17 +
+++ news/feeds.py 2018-09-15 07:44:50 +
@@ -21,25 +21,3 @@
def item_pubdate(self, item):
return item.publish
-
-# Currently not used / not checked for compatibility for django 1.8
-
-
-class NewsPostsByCategory(Feed):
-title = 'Widelands.org posts category feed'
-
-def get_object(self, bits):
-if len(bits) != 1:
-raise ObjectDoesNotExist
-return Category.objects.get(slug__exact=bits[0])
-
-def link(self, item):
-if not item:
-raise FeedDoesNotExist
-return item.get_absolute_url()
-
-def description(self, item):
-return 'Posts recently categorized as %s' % item.title
-
-def items(self, item):
-return item.post_set.published()[:10]
=== modified file 'news/urls.py'
--- news/urls.py 2016-12-13 18:28:51 +
+++ news/urls.py 2018-09-15 07:44:50 +
@@ -1,25 +1,25 @@
from django.conf.urls import *
from django.views.generic import ListView
from news.views import NewsList, YearNews, MonthNews, NewsDetail, CategoryView
+from news.feeds import NewsPostsFeed
+
urlpatterns = [
url(r'^(?P[0-9]{4})/(?P[-\w]+)/(?P[0-9]+)/(?P[-\w]+)/$',
NewsDetail.as_view(),
name='news_detail'),
-
url(r'^(?P\d{4})/(?P[-\w]+)/$',
MonthNews.as_view(),
name='news_archive_month'),
-
url(r'^(?P\d{4})/$',
YearNews.as_view(),
name='news_archive_year'),
-
url(r'^category/(?P[-\w]+)/',
CategoryView.as_view(),
name='category_posts'),
-
url(r'^$',
NewsList.as_view(template_name='news/post_list.html'),
name='news_index'),
+# Feed
+url(r'^feed/$', NewsPostsFeed())
]
=== modified file 'pybb/feeds.py'
--- pybb/feeds.py 2018-04-08 14:40:17 +
+++ pybb/feeds.py 2018-09-15 07:44:50 +
@@ -3,6 +3,7 @@
from django.core.exceptions import ObjectDoesNotExist
from django.utils.feedgenerator import Atom1Feed
from pybb.models import Post, Topic, Forum
+from django.conf import settings
class PybbFeed(Feed):
@@ -60,11 +61,6 @@
def
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
Review: Approve I have added the info to the tooltips. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands
Review: Needs Fixing One of the tests in our test suite has an endless loop in it: test/maps/ship_transportation.wmf/scripting/test_rip_ports_with_worker_in_transit.lua This already happened with older versions of this branch, so I don't think that it's anything I did. -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/354019 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling_2. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
