[UPDATE] Reboot

clean

+#!/bin/bash
+
+ find . -name '*.pyc' -delete

gargantext_web/settings.py

@@ -86,7 +86,7 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'gargandb',
-        'USER': 'alexandre',
+        'USER': 'pksm3',
         'PASSWORD': 'C8kdcUrAQy66U',
         #'USER': 'gargantext',
         #'PASSWORD': 'C8krdcURAQy99U',

node/models.py

@@ -96,9 +96,13 @@ class Node(CTENode):
     
     
     def add_resource(self, **kwargs):
+<<<<<<< HEAD
         # only for tests
         resource = Resource(guid=str(time()), digest=str(time()), **kwargs )
         
+=======
+        resource = Resource(**kwargs)
+>>>>>>> 00f422e66ce8fcb7f534fdb51a21500042c8b6f9
         # TODO: verifier si tous ces 'save' sont reellement utiles
         resource.save()
         node_resource = Node_Resource(

static/js/tinawebJS

+/srv/tinawebJS
\ No newline at end of file