Commit 135a7c82 authored by Adam Rambousek's avatar Adam Rambousek
Browse files

Fix #160 poznamka v notifikaci

parent f6174be1

deb-server/lib/servlets/tecu.rb

+5 −5
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ class TecuServlet < DictServlet 
    changes = []

    notes = []

    diff.each{|dh|

      next if dh['path'].include?('@schvaleno') or dh['path'].include?('paths') or dh['path'].include?('notes') or dh['path'].include?('timestamp') or dh['path'].include?('@number') or dh['path'].include?('schvaleni') or dh['path'].include?('wait_for') or dh['path'].include?('@status')

      next if dh['path'].include?('@schvaleno') or dh['path'].include?('paths') or dh['path'].include?('notes') or dh['path'].include?('timestamp') or dh['path'].include?('@number') or dh['path'].include?('schvaleni') or dh['path'].include?('wait_for') or dh['path'].include?('@status') or dh['path'].include?('comment') or dh['path'].include?('@obor_color') or dh['path'].include?('@obor_mark')

      next if dh['op'] == 'add' and dh['value'] == {}

      $stderr.puts dh

      if dh['op'] == 'add'
@@ -1440,6 +1440,10 @@ def do_GET(request, response) 
          }

          schvalila_role = user_roles[0] if schvalila_role == ''

          diffnotes << @dict_array['settings'].get_settings['roles'].select{|r| r['role']==schvalila_role}[0]['label']

          unless data_hash['entry']['comment'].nil?

            diffnotes << data_hash['entry']['comment'].to_s

            data_hash['entry'].delete('comment')

          end

          newnote = {

            '@author' => user,

            '@time' => Time.now.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1448,10 +1452,6 @@ def do_GET(request, response) 
            '$' => diffnotes.join(', ')

          }

          @dict_array['notification'].prepare_notif(id, term_cz, wait_for, diffnotes.join(', '), user, @dict_array['tecu_user'])

          unless data_hash['entry']['comment'].nil?

            newnote['@comment'] = data_hash['entry']['comment']

            data_hash['entry'].delete('comment')

          end

          data_hash['entry']['notes']['note'] << newnote



          #zkontrolovat pred schvaleni