Ubuntu IRC Bots

Merge lp:~lderan/ubuntu-bots/meeetingology-output into lp:~ubuntu-bots/ubuntu-bots/meetingology

  1. meeetingology-output
  2. Merge into meetingology
Proposed by Thomas Molloy
Status: Superseded
Proposed branch: lp:~lderan/ubuntu-bots/meeetingology-output
Merge into: lp:~ubuntu-bots/ubuntu-bots/meetingology
Diff against target: 48 lines (+6/-5)
2 files modified
meeting.py (+2/-2)
writers.py (+4/-3)
To merge this branch: bzr merge lp:~lderan/ubuntu-bots/meeetingology-output
Reviewer Review Type Date Requested Status
Alan Bell Pending
Review via email: mp+210693@code.launchpad.net

This proposal supersedes a proposal from 2014-02-08.

This proposal has been superseded by a proposal from 2014-04-15.

Description of the change

fix for the moinmoin output & DONE items

To post a comment you must log in.
Revision history for this message
Alan Bell (alanbell) wrote : Posted in a previous version of this proposal

fix typo

review: Approve
lp:~lderan/ubuntu-bots/meeetingology-output updated
21. By Alan Bell

accpeting merge

22. By Thomas Molloy

DONE items for MoinMoin outputs now show up as DONE instead of ACTION

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'meeting.py'
2--- meeting.py 2014-02-07 17:30:02 +0000
3+++ meeting.py 2014-04-15 19:06:02 +0000
4@@ -574,10 +574,10 @@
5 commands = ["action", "info", "idea", "nick", "link", "commands"]
6 commands.sort()
7 self.reply("Available commands: "+(" ".join(commands)))
8- def do_done(self, nick, **kwargs):
9+ def do_done(self, nick, line, **kwargs):
10 """Add aggreement to the minutes - chairs only."""
11 if not self.isChair(nick): return
12- m = items.Done(**kwargs)
13+ m = items.Done(nick=nick, line=line, **kwargs)
14 self.additem(m)
15
16
17
18=== modified file 'writers.py'
19--- writers.py 2014-02-08 12:05:30 +0000
20+++ writers.py 2014-04-15 19:06:02 +0000
21@@ -1213,7 +1213,6 @@
22 M = self.M
23 # Votes
24 Votes = [ ]
25- Votes.append(self.heading('Vote results'))
26 # reversed to show the oldest first
27 if len(M.votes) > 0:
28 for m in M.votes:
29@@ -1227,7 +1226,9 @@
30 Votes.insert(0, " * Voters " + publicVoters)
31 Votes.insert(0," * " + motion + " (For/Against/Abstained "+str(M.votes[m][0])+"/"+str(M.votes[m][2])+"/"+str(M.votes[m][1]) + ")")
32 # differentiate denied votes somehow, strikethrough perhaps?
33- Votes.insert(0," * [[%(fullLogsFullURL)s#"+str(M.votes[m][3])+" "+m+"]]")
34+ voteLink = "%(fullLogsFullURL)s"%self.replacements()
35+ Votes.insert(0, " * [["+voteLink+"#"+str(M.votes[m][3])+" "+m+"]]")
36+ Votes.insert(0, self.heading('Vote results'))
37 Votes = "\n".join(Votes)
38 return Votes
39
40@@ -1336,7 +1337,7 @@
41 body = [ ]
42 body.append(self.body_start%repl)
43 body.append(self.meetingItems())
44- body.append(self.votes()%repl)
45+ body.append(self.votes())
46 body.append(self.actionItemsPerson())
47 body.append(self.doneItems())
48 body.append(self.peoplePresent())

Subscribers

People subscribed via source and target branches