davidray

// Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults

var rowGuid = 0;

var $j = jQuery.noConflict();

jQuery(document).ready(function($){

  $("#markItUp").markItUp(nameOfSettings);

davidray

david@trisano:~/trisano-enterprise$ git status
ce: needs merge
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   .gitignore
#	new file:   avr/bi/bi_server_replacement_files/pentaho.xml
#	new file:   avr/bi/scripts/build_trisano_bi.sh
#	modified:   files/zabbix-trisano.xml

davidray

david@trisano:~/trisano-enterprise$ git reset --hard
HEAD is now at 40ec7ac... Updating CE module to latest
david@trisano:~/trisano-enterprise$ git pull
remote: Counting objects: 10, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 6 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From git@github.com:csinitiative/trisano-enterprise
   65de690..285506e  master     -> origin/master
Auto-merged ce

davidray

david@trisano:~/trisano-enterprise$ git reset --hard HEAD
HEAD is now at 40ec7ac... Updating CE module to latest
david@trisano:~/trisano-enterprise$ git submodule update
Submodule path 'ce': checked out 'c32d0d629c01fb440c4d7f9a8fbed0aa0fbf2c5b'
david@trisano:~/trisano-enterprise$ git pull
Auto-merged ce
CONFLICT (submodule): Merge conflict in ce - needs afacaceea4b215aa1455ffc5a613251ff5c76870
Automatic merge failed; fix conflicts and then commit the result.

davidray

david@trisano:~/trisano-enterprise$ git status
ce: needs merge
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   .gitignore
#	new file:   avr/bi/bi_server_replacement_files/pentaho.xml
#	new file:   avr/bi/bi_server_replacement_files/start-pentaho.sh
#	new file:   avr/bi/scripts/build_trisano_bi.sh

davidray

david@trisano:~/trisano-enterprise$ git status
ce: needs merge
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   .gitignore
#	new file:   avr/bi/bi_server_replacement_files/pentaho.xml
#	new file:   avr/bi/bi_server_replacement_files/start-pentaho.sh
#	new file:   avr/bi/scripts/build_trisano_bi.sh

davidray

 git pull --rebase
First, rewinding head to replay your work on top of it...
HEAD is now at 285506e... Adds headless AWT option to start up. Allows Jasper to run reports when not started as the X11 session owner.
Applying Updating CE module to latest
error: patch failed: ce:1
error: ce: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged ce
CONFLICT (submodule): Merge conflict in ce - needs c32d0d629c01fb440c4d7f9a8fbed0aa0fbf2c5b

davidray

 NoMethodError in Search#cmrs

Showing app/views/search/cmrs.csv.haml where line #17 raised:

undefined method `event_fields' for #<Class:0xb595b824>

Extracted source (around line #17):

14: -# If not, see http://www.gnu.org/licenses/agpl-3.0.txt.
15: 

davidray

NoMethodError in # 
Showing app/views/events/_clinical_show_tab.html.haml where line #127 raised: 

You have a nil object when you didn't expect it!
The error occurred while evaluating nil.place

Extracted source (around line #127): 

124: 
125:         - for diagnostic in @event.diagnostic_facilities

davidray

Processing UsersController#shortcuts (for 10.0.1.9 at 2009-05-27 11:51:06) [GET]
[2009-05-27 11:51:06] [INFO ] Using TriSano user found in local environment variable
[2009-05-27 11:51:06] [INFO ] Attempting to load user with a UID of 100012241
[2009-05-27 11:51:06] [DEBUG]   User Load (3.7ms)   SELECT * FROM "users" WHERE ("users"."uid" = E'100012241') LIMIT 1
[2009-05-27 11:51:06] [INFO ] User loaded: 100012241
[2009-05-27 11:51:06] [INFO ] Completed in 52ms (View: 2, DB: 5) | 200 OK [http://10.0.1.9/trisano/users/shortcuts]