Commit 8b8bf1f2 authored by Frank Bergmann's avatar Frank Bergmann

- some changes on forums (don't know anymore)

- Added parameters to timesheet2 to force logging of
  hours
parent c2e5054c
...@@ -430,7 +430,7 @@ where ...@@ -430,7 +430,7 @@ where
" "
# Check for the root-parent message in order to determine # Check for the root-parent message in order to determine
# whethter the user has subscribed to it or not. # whether the user has subscribed to it or not.
set ctr 0 set ctr 0
while {"" != $parent_id && 0 != $parent_id && $ctr < 10} { while {"" != $parent_id && 0 != $parent_id && $ctr < 10} {
ns_log Notice "intranet-forum/new-2: looking up parent $parent_id of topic $topic_id" ns_log Notice "intranet-forum/new-2: looking up parent $parent_id of topic $topic_id"
...@@ -535,10 +535,13 @@ where m.topic_id=:topic_id ...@@ -535,10 +535,13 @@ where m.topic_id=:topic_id
db_foreach update_stakeholders $stakeholder_sql { db_foreach update_stakeholders $stakeholder_sql {
ns_log Notice "intranet-forum/new-2: Sending alerts: user_id=$stakeholder_id, importance=$importance, receive_updates=$receive_updates"
if {$importance == 0} { continue } if {$importance == 0} { continue }
if {[string compare $receive_updates "none"]} { continue } if {[string compare $receive_updates "none"]} { continue }
if {$importance < 2 && [string compare $receive_updates "major"]} { continue } if {$importance < 2 && [string compare $receive_updates "major"]} { continue }
ns_log Notice "intranet-forum/new-2: Sending out alert: '$subject'"
im_send_alert $stakeholder_id "hourly" $subject "$msg_url\n\n$message" im_send_alert $stakeholder_id "hourly" $subject "$msg_url\n\n$message"
} }
......
...@@ -329,7 +329,7 @@ if {$task_or_incident_p} { ...@@ -329,7 +329,7 @@ if {$task_or_incident_p} {
<td> <td>
<select name=priority> <select name=priority>
<option value=1>1 - [_ intranet-forum.Emergency]</option> <option value=1>1 - [_ intranet-forum.Emergency]</option>
<option value=2>2 - Very Urgent#></option> <option value=2>2 - [lang::message::lookup "" intranet-forum.Very_Urgent "Very Urgent"]</option>
<option value=3>3 - [_ intranet-forum.Urgent]</option> <option value=3>3 - [_ intranet-forum.Urgent]</option>
<option value=4>4 - [_ intranet-forum.High_Normal]</option> <option value=4>4 - [_ intranet-forum.High_Normal]</option>
<option value=5 selected>5 - [_ intranet-forum.Normal]</option> <option value=5 selected>5 - [_ intranet-forum.Normal]</option>
...@@ -429,6 +429,9 @@ incr ctr ...@@ -429,6 +429,9 @@ incr ctr
# -------------- Scope ----------------------------- # -------------- Scope -----------------------------
# Default is "group", if the user can do it...
if {[im_permission $user_id add_topic_group]} {set scope "group"}
if {$topic_type_id != [im_topic_type_id_reply]} { if {$topic_type_id != [im_topic_type_id_reply]} {
if {$object_admin || $user_id == $owner_id} { if {$object_admin || $user_id == $owner_id} {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment