From 5a9b7fdca5eb0420cd7589f01bbbb56f768487d8 Mon Sep 17 00:00:00 2001 From: Stefan Frauenknecht Date: Thu, 31 Jan 2013 20:37:55 +0100 Subject: [PATCH] Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel) --- openslides/agenda/models.py | 2 +- .../agenda/templates/agenda/item_row.html | 9 ++- .../agenda/templates/agenda/overview.html | 19 ++++-- openslides/locale/de/LC_MESSAGES/django.mo | Bin 36810 -> 36877 bytes openslides/locale/de/LC_MESSAGES/django.po | 61 +++++++++--------- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py index 4e057ab5b..72300d699 100644 --- a/openslides/agenda/models.py +++ b/openslides/agenda/models.py @@ -181,7 +181,7 @@ class Item(MPTTModel, SlideMixin): permissions = ( ('can_see_agenda', ugettext_noop("Can see agenda")), ('can_manage_agenda', ugettext_noop("Can manage agenda")), - ('can_see_orga_items', ugettext_noop("Can see orga items")), + ('can_see_orga_items', ugettext_noop("Can see orga items and time scheduling of agenda")), ) class MPTTMeta: diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index 89c41aa92..3d644543e 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -25,12 +25,15 @@ {% if perms.agenda.can_manage_agenda %} - {{ item.comment|first_line }} + {{ item.comment|first_line }} + {% endif %} + {% if perms.agenda.can_see_orga_items %} - {{ item.duration|time:"H:i" }} + {% if item.duration %} + {{ item.duration|time:"H:i" }}h + {% endif %} - {% endif %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 110f0e1f7..d815605ff 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -49,17 +49,20 @@ {% endif %} -

{% trans "Agenda" %}

- +

{% trans "Agenda" %} + {% if perms.agenda.can_see_orga_items %} +

- + - + -
{% trans "Start of event" %}{% trans "Start of event" %}: {{ start|time:"H:i" }}
{% trans "Estimated end" %}{% trans "Estimated end" %}: {{ end|time:"H:i" }}
+ + {% endif %} +

{% trans "Filter" %}: {% trans "Hide closed items" %} @@ -73,7 +76,7 @@ {% if perms.agenda.can_manage_agenda %} {% trans "Comment" %} {% endif %} - {% if perms.agenda.can_manage_agenda %} + {% if perms.agenda.can_see_orga_items %} {% trans "Duration" %} {% endif %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} @@ -90,7 +93,9 @@ {% if perms.agenda.can_manage_agenda %} - {{ duration|time:"H:i" }} + {% endif %} + {% if perms.agenda.can_see_orga_items %} + {{duration|time:"H:i"}}h {% endif %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 55f3077b44ed18eec1a3ebb00b378df27c6665d9..c367970c06d1ce431958a49e8a9280fb09dee4c0 100644 GIT binary patch delta 7430 zcmXZe34D)79>?(~A@@;pQ!J!{)#<4V*Sc^zYLKPuoV)B^6H z`ule^hM@wDLIoI$3M{SmIr~41LIDj=p&~tmiuCW8hW|hfs0~wl0BWKz)RrY+YfQqX zI0QXdg1NXBv++l4g-PAbc!RMk^E)FbWZ`NgCC+I~!An>lLwcADB;al8El?|p?P)TW zgbF+Z6;Kv(!<-yU#Cg`ur~nV6&d5b{mC~COw5Ja+3hQK=6vtp4>KUk&cR^*MCu*X; zsEKni4o9LgGaD7)64d*vP%B@Ln(q@-zb`V`e-*x`L5J)o)ENltWsF0$r=j+GC?;Vs z>M&NIo^L{}^keHqQ~-5*n|`6FfRj<}dguR^{59ctkJq23E;KlNS=D&>jji`m!+bI^nNE(NV@5i0c?QG31@8{je9UTy3D z!N#=v^)Y%-?{!1G;(MqJ`1R$$VmK;8o$)cuLFRFtl@t`&I#h?9)_tfw z{0P$pnz$eETjtZ;^YJwD0K#yS?%)?ZC2|ZYe0eD*N%a6U4ocycf zN&BE0HPJQH7TiHSud#*VFfp zK=(EUt@t5o0>8oLTb_(z)cc@L|4&_es1&|v-GIu-UewBuqP{CXSRddc)Ef-3 znM2Nm>vW-@iTYzO=Ai-_k0Ce}>)~^#$d_U$u0-wiMpVByP~*IV+L8~EZ zz(Y~}qcB|eKhZX{MXjg@>J$0|>Q}88welsXm90iixC?b_4%qf845xk-wPp8FDQ_~& z9O?v2rQQ`=Vi9_n-&svTd$$ku0r?hV@gC~M`cIfZdZ35;Xw;dRkNkKl7wWA185`jlTfc?MZ1`w%yVB4@eIT|#uWJkIv6P07u>*D*V^Uab zEwwJRF2jbr_bMtQyRjY~!20+ZDihyhI^IOxmiVzIfF!KF|9vTF1p`rgI?6g7n^1od z70@=+R-Hyoa30m~4k{BqPn+vk4;xUAw`QPLnu~E*g8K5U##r6|gA{59My=pHYHxo= z-S>yM7M*eY!3gWH7$-dAIGiu13U%0$^3AnNM~(LcCg3~11D_ese+-aYmz^2qMVq^51V6LGDn^7N#%H*@CYq$ax&{pij z{7xkWO>iG|N*fj!(@`D!p#mzvPUyv+xE=NWWmM*VLv2NPp=pmp1=I<(g+o!#7o*O` zT6Fcv{1XLDupbr3Vbs9?#5#B%_1;6&H#}&f*~><#dS}$B&%suhkLtf1HSTs)=Juer z<~Y_~ww6Wl}%Sc6(oXpyPMp-y`m>d_uJEQ`ineCOJ-9 z?17J>7yIH4?1ncdk^f#4T1_?)O+i2Evrqw*VRKx9I%IoLEBO!==vSycJ&#K1FShQ- z2~`H7u`aen1>6y}fP7RYyeAp(`srRa~ZV|Uz!n)nA)DzBjS`WkA2 zFt1r@3?@;}!e&^6+-zqV@~U$KGjQ~DlloPdt^2=;0v|Ew0_qExIm3LRhND(gh6-Rk zM)`1Wv35nzn#>)tevNwXGU|H%8+CSC&(w#8?+I#4%dj5)0Yi2F->0CIAHhfP1S+-F zsO$HOeSXjSJ1T&{5;IUFYT#z5>pK9InJK7D&c-w>x9z(yjQRm|!zmo2paD){1lFJq zQ}`?n7AB!mItp9k0u05sQ7J!YpP#epmrM&vLVXv~P+OOS`VAO>%0O```PUa}9t{fQ zRn&mnQ7b%w$#@z=@K;pi{+Z)wkENUgCsP`*Sd;1>hy|bwPcTn$zJ!ifnDX4(cP~&z(1vUa3 z;6#^#Qac|T;x^Qt9mFg=gfZwd*QBm7DnngR{l=oU?0MAQufa&%hswlp)caqd-n)yr z7*J-mz#T@R5e*Yik(Q%6E<^3%tEfn~+UNW2^P{KxKc5{?d!A$KV^G&@2I`Q#hHdeH z^C zjU8|_YO5+x8Lq@=Jc0?j|KF*A4^Ugth{jm#fSO>4t&c*Tg*m7JR$+bIVe5av9@I}` zHbyQqXCcp8j7ojE^%Zp0VLb&!_zmjQ`T%u^VxKpeNJmZ73pK!S?1uTM>$e$|p-)j6 zI)lp4MO46dP=`8fkv$t2M?HBF`PYkm?1Lw*6H%#}gF1YRts7B+yoVa#IBMWas55g7 zbW>TKNYw6yOh-hFLEfXP^$%7Ho>2VqN?R^>@Ne z)TzFMdavs28KYkXuk4 zciZRtttV0AT)-xH7nPximrda5s6#yrmC*^P%)4_bDAmjC3$I(>M(ycGsMCBBmEw!2 ziEdy3`YbUk4zk9g0!_z(*b~)nxph4%kT;Pt<~o%WY7Ya``}I-iZ^U~=5q7gi#=)Ij2tKD94g>vR+#svV<`0_7{dHc6@?_M#z6cX zgE4TWIW+arLp>VxybEd%dt(UZVKz=cZOIPQ-tI-c{|UClljx6kQT=ML_V+)q!fZh_ zX7L~eby|y2Ti`|Q*$PzTThIr0p}rHlZTrWlYxf0);T2Rsw^0E-MD-iY|N8Hkk5hR) zeyor0=RTFWo?*Ve!<@=3O-K0Ad^cr7aJ(nqTi}^Bd0L^TWWuDvg3_szy+xks6FvDw zh2Dbv%8K@vk^?*ALy$v}LsUfgD=6R}L_kH*%!5c!%lphD7Vjg4)J)|GZPV2-&rDlO zO|x{}P}I~l_m!zzcBti5y|mJb@u;bkbQHDX z->@~tb#R;~ z&}vlwji?pxLQQ-Swa{v-`v(QR7}(LIwlTJ(-WpqBUrfN+sLZ^I3g9i&mhHCf2T|kv z2bHM{n26U?BjHO~T%td8pC@R27sP{`yE1!d!Zwsp5I}ek872cykhwNk2if&pT*!HllX0Nj_ zk>|Zphj9j~Um0qpo2^Gt0sM$MBfp>m4(w*e4@LEl?dF<>6dDv+4r+ot`@%$QMST`3 zLmNf6J-*9_G^3!||oYQ>{b87@YRTVm@kpsuOAnu7Lvn|#xXyG6iflHj!&2*N z)E;g?b=-iH$>4GgA!7j=CCdz*n{Q0>i88B0ZFBm=$J3zezasD&=a zmbllY(1OC(I1KM&D;(O#baYYIYzJx&PogHciCXDzsQ2%n25$bC2{<1$@gO8wPC5GF zC#e3XPz!X=QqYPoq9&+DeaizMH>q!lI{jH#7YCs_jzXnyoOK>5BP&rW--`OK{M-69 zhEe|mYctok_Dr}=4260;@S;+fg9<1QL+~+dfWuLdPsUK3j>^D%RKJC&ah9R>`tQiM z%X!1rt5Jdfg6jV}*4O>_>t`AwP%DZ@eL~x#GSM5g@=2(bm7*rBK;4>GYg;?3(&*-PALWL-D=baqB-?8Cy4${415mhO%1x3CXt8g1gB1 zaAu-Xb{w-YV7RGwLG5)JDzFOF7Olr7xZl=4M`gAK<1uW6S!g;YQ}65A!W^7Q!)DCF z#!r|O_O=eO7FnlaH19ow%E(LD0AImKd>fUC_b?q#p)%o&Gyw#lw%ARgpcSN}_O!FL zA2y{v4i(S>)K=|7O>hL&?;I)A=IYP^h};_T5}MSNrogJC7=umwD6u3b24y!NP+cS8mIBx=uRVj6D3B;Eg$ z6g)Kifm(6nA`?J6)cx*)aX1*YvYF_?rS|zhum$y_7=zWAioSm_0i~nH9e}!qPoV-T z$2jJ9)~JAcP^a_@>vdGeI>jcS=GcL{7rS5)>itcq%pF8+#mBb&D^x(YFbnICHP5@F z&PG3UwP(c?l=2c(AoEZIzlwgi2ld{5)HnP%YA?^(`fsRH??2A|X&2SM05xtADsxj% zTeARlXqSy6|4PML8Z^NU)C31mEBeURze1h%tEfZgGv4fFeaxhui`s&zsB5|$Gw?%f zi+3;wy%RV$I2JqMjtS(yD}`zr6jAa-b4@Z(0cB$=d<1pKrl3|b8x?2;YEL(yQu>aq zA3pcXXE*5{%6xvMB>;;pF2_M-+qhMMRzRL8Rzh*wZ6yN0?Q{!`2~ zi$(6U(-}3+Fbu|V7=$xW{pO;!W;HUN>l~*rn}*L&Db1g1CLWBPsgFcWydIUx&8WTJ zhMM36YNcl}5g%XzCQjqdV^5^X*^ce7@lz)CeK1e=e;5TmTFz^zFW_BliQ&`Din37w z48$lO$9V#4S2V+9ZmxA1>b*^<>-je7?EHjD7*=AoG#eXGAA_N~|1&5k_J7Ei|W`DwTA<+AwFTBm)Pgep(b34TG4jY0uG`EK8?Bsmu-9V zxn?UmqPA`nvQXEVOhFTspgPV)1@I!q;9AVY-M0M)jHF(J+H?PTrrrc~&C;;;7Y%Gn zz0|q|wPj~f^WDW1-TylCP2}mQ6y>7=8H#OiB5H-Npbp_%sQ31u4(V}hilfXMp%aNy8kb$fcvlsp2JwIK}}GPmsD?rIt%(sYYor`m5H&oJ_jG7 zz5?^`B-UbErmO3)&Z=KfZ~& z-#btrm|dvDcOI3w2bh5oe>H!O$U{HsYpm-~KPxu46ttqPn2rZf1O1FzdH4(F5GA3$ zkRwnXC!wB~SQn$lc@1?KccU`&87lDWsMLooGW|TL%)1>ZDAhetFATPhNA2k|sMEX{ zmEzY?6K%&pJd9fLaqE|;K(AvT{2!`c!D8b;)I6h+e*FC(h1$b|I{m9q_kJhF;fJUI zt1%vLqb6whHS=+*uAE-{B;2qyF3dDMVA zu|1weFNQ2N--B%IL46$d!|k^HuGRaZ`SJ}%j*+tt6>zf(^L{FZQZK_0=69A-NW`^R z7Y|`D9zz|PQ|Q4n_W5np-rvU%j9O;yy9WcQk45e6RMdDbrr=@>z}={R2e9_%|1k>M zf-~41zei1+^pe>EFKW*UQIU^8ADn>N`$@KaKI+;n!FsqE6;LHAp#7+RkMp1YIqKt7 zU5gv(!!}hFdiwkNe&kd2T8qJTeEL`2PFf#awKMZdVqjZOMs{vy+p4ug+K2j;j-9aT No1)mN2F3Th{|DNEp2`3K diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 5377c58f9..c00022f33 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 17:20+0100\n" +"POT-Creation-Date: 2013-01-31 20:14+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -33,7 +33,11 @@ msgstr "Französisch" msgid "Parent item" msgstr "Elternelement" -#: agenda/forms.py:64 +#: agenda/forms.py:34 agenda/models.py:49 +msgid "Duration (hh:mm)" +msgstr "Dauer (ss:mm)" + +#: agenda/forms.py:69 msgid "Begin of event (hh:mm)" msgstr "Beginn der Veranstaltung (ss:mm)" @@ -56,7 +60,7 @@ msgstr "Titel" msgid "Text" msgstr "Text" -#: agenda/models.py:41 agenda/templates/agenda/overview.html:74 +#: agenda/models.py:41 agenda/templates/agenda/overview.html:77 #: agenda/templates/agenda/view.html:13 participant/models.py:60 #: participant/templates/participant/overview.html:72 #: participant/templates/participant/user_detail.html:45 @@ -67,7 +71,7 @@ msgstr "Kommentar" msgid "Closed" msgstr "Abgeschlossen" -#: agenda/models.py:43 agenda/templates/agenda/overview.html:83 +#: agenda/models.py:43 agenda/templates/agenda/overview.html:86 #: projector/models.py:31 msgid "Weight" msgstr "Gewichtung" @@ -79,10 +83,6 @@ msgstr "Gewichtung" msgid "Type" msgstr "Typ" -#: agenda/models.py:49 -msgid "Duration (hh:mm)" -msgstr "Dauer (ss:mm)" - #: agenda/models.py:182 msgid "Can see agenda" msgstr "Darf die Tagesordnung sehen" @@ -92,25 +92,25 @@ msgid "Can manage agenda" msgstr "Darf die Tagesordung verwalten" #: agenda/models.py:184 -msgid "Can see orga items" -msgstr "Darf Organisationspunkte sehen" +msgid "Can see orga items and time scheduling of agenda" +msgstr "Darf Organisationspunkte und Zeitmanagement der Tagesordnung sehen " -#: agenda/models.py:194 agenda/slides.py:20 agenda/views.py:219 +#: agenda/models.py:192 agenda/slides.py:20 agenda/views.py:219 #: agenda/views.py:220 agenda/views.py:257 agenda/views.py:271 #: agenda/templates/agenda/base_agenda.html:10 #: agenda/templates/agenda/overview.html:8 #: agenda/templates/agenda/overview.html:52 -#: agenda/templates/agenda/overview.html:89 +#: agenda/templates/agenda/overview.html:92 #: agenda/templates/projector/AgendaSummary.html:6 #: agenda/templates/projector/AgendaSummary.html:10 msgid "Agenda" msgstr "Tagesordnung" -#: agenda/views.py:81 +#: agenda/views.py:82 msgid "You are not authorized to manage the agenda." msgstr "Sie sind nicht berechtigt die Tagesordnung zu ändern." -#: agenda/views.py:97 +#: agenda/views.py:98 msgid "Errors when reordering of the agenda" msgstr "Fehler beim Neusortieren der Tagesordnung" @@ -161,12 +161,12 @@ msgstr "Eintrag anzeigen" #: agenda/templates/agenda/base_agenda.html:31 #: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:16 -#: agenda/templates/agenda/item_row.html:44 +#: agenda/templates/agenda/item_row.html:47 msgid "Edit item" msgstr "Eintrag bearbeiten" #: agenda/templates/agenda/base_agenda.html:33 -#: agenda/templates/agenda/item_row.html:45 +#: agenda/templates/agenda/item_row.html:48 msgid "Delete item" msgstr "Eintrag löschen" @@ -243,12 +243,12 @@ msgstr "Eintrag als erledigt markieren" msgid "Item closed" msgstr "Eintrag erledigt" -#: agenda/templates/agenda/item_row.html:39 -#: agenda/templates/agenda/overview.html:99 +#: agenda/templates/agenda/item_row.html:42 +#: agenda/templates/agenda/overview.html:104 msgid "Activate item" msgstr "Eintrag projizieren" -#: agenda/templates/agenda/item_row.html:48 +#: agenda/templates/agenda/item_row.html:51 #: agenda/templates/agenda/widget.html:35 msgid "Activate summary for this item" msgstr "Zusammenfassung für diesen Eintrag projizieren" @@ -279,44 +279,44 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: agenda/templates/agenda/overview.html:55 +#: agenda/templates/agenda/overview.html:56 msgid "Start of event" msgstr "Beginn der Veranstaltung" -#: agenda/templates/agenda/overview.html:59 +#: agenda/templates/agenda/overview.html:60 msgid "Estimated end" msgstr "Voraussichtliches Ende" -#: agenda/templates/agenda/overview.html:64 +#: agenda/templates/agenda/overview.html:67 #: assignment/templates/assignment/overview.html:12 #: motion/templates/motion/overview.html:12 #: participant/templates/participant/overview.html:22 msgid "Filter" msgstr "Filter" -#: agenda/templates/agenda/overview.html:65 +#: agenda/templates/agenda/overview.html:68 msgid "Hide closed items" msgstr "Verstecke abgeschlossene Einträge" -#: agenda/templates/agenda/overview.html:68 +#: agenda/templates/agenda/overview.html:71 msgid "item" msgid_plural "items" msgstr[0] "Eintrag" msgstr[1] "Einträge" -#: agenda/templates/agenda/overview.html:71 +#: agenda/templates/agenda/overview.html:74 msgid "Done" msgstr "Erledigt" -#: agenda/templates/agenda/overview.html:72 +#: agenda/templates/agenda/overview.html:75 msgid "Item" msgstr "Eintrag" -#: agenda/templates/agenda/overview.html:77 +#: agenda/templates/agenda/overview.html:80 msgid "Duration" msgstr "Dauer" -#: agenda/templates/agenda/overview.html:80 +#: agenda/templates/agenda/overview.html:83 #: assignment/templates/assignment/overview.html:28 #: motion/templates/motion/overview.html:43 #: participant/templates/participant/group_overview.html:14 @@ -324,7 +324,7 @@ msgstr "Dauer" msgid "Actions" msgstr "Aktionen" -#: agenda/templates/agenda/overview.html:115 +#: agenda/templates/agenda/overview.html:120 #: agenda/templates/agenda/widget.html:46 #: projector/templates/projector/custom_slide_widget.html:36 msgid "No items available." @@ -2421,6 +2421,9 @@ msgstr "undefinierter-dateiname" msgid "Enter valid JSON" msgstr "Gebe valides JSON ein" +#~ msgid "Can see orga items" +#~ msgstr "Darf Organisationspunkte sehen" + #~ msgid "Visible to all" #~ msgstr "Für alle sichtbar"