0001-fold-summary-and-log-if-form-has-already-been-seen-9.patch

Thomas Noël, 28 janvier 2016 18:39

Voir les différences: en ligne côte à côte

Subject: [PATCH] fold summary and log if form has already been seen (#9175)

 wcs/forms/common.py                 | 40 ++++++++++++++-------
 wcs/qommon/static/css/dc2/admin.css |  7 ++--
 wcs/qommon/static/css/qommon.css    | 69 +++++++++++++++++++++++++++++++++++--
 3 files changed, 99 insertions(+), 17 deletions(-)

             return r.getvalue()
         def deja_vu(self):
             user = get_request().user
             if not self.filled.evolution or not user:
                 return False
             for evo in self.filled.evolution:
                 if evo.who == user.id or (evo.who == '_submitter' and self.filled.is_submitter(user)):
                     return True
             return False
         def _q_index(self):
             mine = self.check_auth()
             get_logger().info('form %s - id: %s - view' % (self.formdef.name, self.filled.id))
-...
             r = TemplateIO(html=True)
             deja_vu = self.deja_vu()
             r += self.receipt_message(mine=mine)
             r += self.receipt()
             r += self.history()
             r += self.receipt(deja_vu=deja_vu)
             r += self.history(deja_vu=deja_vu)
             form = None
-...
                 r += htmltext('</div>')
                 return r.getvalue()
         def history(self):
         def history(self, deja_vu=False):
             if not self.filled.evolution:
                 return
             if not self.formdef.is_user_allowed_read_status_and_history(get_request().user, self.filled):
                 return
             r = TemplateIO(html=True)
             r += htmltext('<div class="bo-block" id="evolution-log">')
             r += htmltext('<h2 class="foldable">%s</h2>') % _('Log')
             if len(self.filled.evolution) > 1:
                 r += htmltext('<h2 class="foldable%s">%%s</h2>' % (deja_vu and ' folded' or '')) % _('Log')
             else:
                 r += htmltext('<h2>%s</h2>') % _('Log')
             r += htmltext('<ul id="evolutions">')
             hidden = False
             previous_status = None
             for evo in self.filled.evolution:
             for evo_number, evo in enumerate(self.filled.evolution, 1):
                 if evo.status:
                     wf_status = self.filled.get_status(evo.status)
                     if wf_status and not wf_status.is_visible(self.filled, get_request().user):
-...
                         except KeyError:
                             pass
                 if evo_number == len(self.filled.evolution):
                     r += htmltext('</ul><ul id="evolution-last">')
                 r += htmltext('<li class="%s">' % klass)
                 r += htmltext('<div>')
-...
                 r += htmltext('</div>')
                 r += htmltext('</li>')
             r += htmltext('</ul>')
             r += htmltext('</div>') # .bo-block #evolution-log
             return r.getvalue()
-...
                 raise errors.AccessForbiddenError()
             return user
         def receipt(self,
                 always_include_user = False,
                 show_status = True,
                 form_url = ''):
         def receipt(self, always_include_user=False, show_status=True, form_url='', deja_vu=False):
             user = get_request().user
             if not always_include_user and get_request().user and \
                     get_request().user.id == self.filled.user_id:
-...
             r = TemplateIO(html=True)
             r += htmltext('<div class="bo-block" id="summary">')
             r += htmltext('<h2 class="foldable">%s</h2>') % _('Summary')
             r += htmltext('<h2 class="foldable%s">%%s</h2>' %
                             (deja_vu and ' folded' or '')) % _('Summary')
             r += htmltext('<div class="dataview">')
             if user:
-...
                         'date': self.filled.anonymised.strftime(misc.date_format())}
                 r += htmltext('</div>')
             r += self.receipt(always_include_user = True)
             deja_vu = self.deja_vu()
             r += self.receipt(always_include_user=True, deja_vu=deja_vu)
             if self.formdef.workflow:
                 r += htmltext(self.filled.display_workflow_message())
             r += self.history()
             r += self.history(deja_vu=deja_vu)
             if form:
                 r += form.render()

+    }
     .foldable:after {
     	content: "▼";
     	font-size: 80%;
     	font-family: FontAwesome;
     	content: "\f147"; /* minus-square-o */
     	text-align: right;
     	float: right;
+    }
     .foldable.folded:after {
     	content: "▶";
     	font-family: FontAwesome;
     	content: "\f196"; /* plus-square-o */
+    }
     ul.biglist li p.commands span,

     ul#evolutions {
     	list-style: none;
     	padding: 0;
     	margin: 0;
     	padding: 0 0 1em 0;
     	margin: 0 0 -2em 0;
     	background: linear-gradient(to right, transparent 0%, transparent 30px, #666 30px, white 32px, #666 34px, transparent 24px, transparent 100%) no-repeat;
+    }
-...
     	background: #ddf;
+    }
     ul#evolution-last {
     	list-style: none;
     	padding: 0;
     	margin: 0;
+    }
     ul#evolution-last li {
     	margin: 1em 0 2em 0;
+    }
     ul#evolution-last div.evolution-metadata {
     	width: auto;
     	display: inline-block;
     	background: white;
     	padding: 1ex;
     	border: 1px solid #666;
     	margin-bottom: 0;
+    }
     ul#evolution-last span.time {
     	display: inline-block;
     	padding-left: 1em;
+    }
     ul#evolution-last span.status {
     	font-weight: bold;
     	display: inline-block;
+    }
     ul#evolution-last span.user {
     	display: block;
     	opacity: 0.5;
+    }
     ul#evolution-last span.user span {
     	font-size: 80%;
+    }
     ul#evolution-last li div.msg {
     	padding: 1ex;
     	border: 1px solid #000;
     	margin-top: -1px;
             box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
     	position: relative;
     	background: white;
+    }
     ul#evolution-last li div.msg span.time {
     	position: absolute;
     	top: 1ex;
     	right: 1em;
     	opacity: 0.5;
+    }
     ul#evolution-last li.msg-in div.msg {
     	margin-left: 60px;
     	margin-right: 10%;
     	background: #dfd;
+    }
     ul#evolution-last li.msg-out div.msg {
     	margin-left: 20%;
     	background: #ddf;
+    }
     div.halfwidth {
     	width: 45%;
     	float: left;
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-fold-summary-and-log-if-form-has-already-been-seen-9.patch