From d6b7a6dabd13d3dfe5dba6754054baf97fd6c91f Mon Sep 17 00:00:00 2001 From: Sayam Kanwar Date: Sat, 8 Dec 2018 19:24:46 +0530 Subject: [PATCH 1/4] Update index.js --- ide/static/js/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ide/static/js/index.js b/ide/static/js/index.js index d387a3637..c45799e80 100644 --- a/ide/static/js/index.js +++ b/ide/static/js/index.js @@ -3,10 +3,12 @@ import React from 'react'; import { render } from 'react-dom'; import { Router, Route, hashHistory } from 'react-router'; import App from './app.js'; +import Home from './home.js'; import '../css/style.css'; render( + , document.getElementById('app') ); From 3ab0419d67bc32e457dab77a224412fa5d299dd0 Mon Sep 17 00:00:00 2001 From: sayamkanwar Date: Mon, 10 Dec 2018 00:50:45 +0530 Subject: [PATCH 2/4] Revert "Update index.js" This reverts commit d6b7a6dabd13d3dfe5dba6754054baf97fd6c91f. --- ide/static/js/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/ide/static/js/index.js b/ide/static/js/index.js index c45799e80..d387a3637 100644 --- a/ide/static/js/index.js +++ b/ide/static/js/index.js @@ -3,12 +3,10 @@ import React from 'react'; import { render } from 'react-dom'; import { Router, Route, hashHistory } from 'react-router'; import App from './app.js'; -import Home from './home.js'; import '../css/style.css'; render( - , document.getElementById('app') ); From 8f9fadbd86a104390e0aaf138fe64da863b903c0 Mon Sep 17 00:00:00 2001 From: sayamkanwar Date: Mon, 10 Dec 2018 00:52:21 +0530 Subject: [PATCH 3/4] Fixed different URLs bug --- ide/views.py | 70 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/ide/views.py b/ide/views.py index 9cd03ea87..8834e6b5f 100644 --- a/ide/views.py +++ b/ide/views.py @@ -89,32 +89,56 @@ def save_to_db(request): net_name = request.POST.get('net_name') user_id = request.POST.get('user_id') next_layer_id = request.POST.get('nextLayerId') - public_sharing = True user = None + public_sharing = True if net_name == '': net_name = 'Net' - try: - # making model sharing public by default for now - # TODO: Prvilege on Sharing - if user_id: - user_id = int(user_id) - user = User.objects.get(id=user_id) - - # create a new model on share event - model = Network(name=net_name, public_sharing=public_sharing, author=user) - model.save() - # create first version of model - model_version = NetworkVersion(network=model, network_def=net) - model_version.save() - # create initial update for nextLayerId - model_update = NetworkUpdates(network_version=model_version, - updated_data=json.dumps({'nextLayerId': next_layer_id}), - tag='ModelShared') - model_update.save() - - return JsonResponse({'result': 'success', 'id': model.id}) - except: - return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])}) + + if Network.objects.filter(name=net_name).exists(): + # Update the exising json field + try: + if user_id: + user_id = int(user_id) + user = User.objects.get(id=user_id) + # load the model with the net name + model = Network.objects.get(name=net_name) + model_id = model.id + # update the model with network id same as model id + existing_model = NetworkVersion.objects.get(network_id=model_id) + existing_model.network_def = net + existing_model.save() + # create initial update for nextLayerId + model_update = NetworkUpdates(network_version=existing_model, + updated_data=json.dumps({'nextLayerId': next_layer_id}), + tag="ModelShared") + model_update.save() + return JsonResponse({'result': 'success','id': model.id}) + except: + return JsonResponse({'result': 'error','error': str(sys.exc_info()[1])}) + else: + try: + if user_id: + user_id = int(user_id) + user = User.objects.get(id=user_id) + # create a new model on save event + model = Network(name=net_name, + public_sharing=public_sharing, + author=user) + model.save() + # create first version of model + model_version = NetworkVersion(network=model, + network_def=net) + model_version.save() + # create initial update for nextLayerId + model_update = NetworkUpdates(network_version=model_version, + updated_data=json.dumps({'nextLayerId': next_layer_id}), + tag="ModelShared") + model_update.save() + return JsonResponse({'result': 'success', + 'id': model.id}) + except: + return JsonResponse({'result': 'error', + 'error': str(sys.exc_info()[1])}) def create_network_version(network_def, updates_batch): From 7284786544fd712e48c4f9907fedbf90a2703ec0 Mon Sep 17 00:00:00 2001 From: Sayam Kanwar Date: Mon, 10 Dec 2018 01:07:39 +0530 Subject: [PATCH 4/4] Fixed network version updates and style issues --- ide/views.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ide/views.py b/ide/views.py index 8834e6b5f..1d1491e9e 100644 --- a/ide/views.py +++ b/ide/views.py @@ -107,14 +107,9 @@ def save_to_db(request): existing_model = NetworkVersion.objects.get(network_id=model_id) existing_model.network_def = net existing_model.save() - # create initial update for nextLayerId - model_update = NetworkUpdates(network_version=existing_model, - updated_data=json.dumps({'nextLayerId': next_layer_id}), - tag="ModelShared") - model_update.save() - return JsonResponse({'result': 'success','id': model.id}) + return JsonResponse({'result': 'success', 'id': model.id}) except: - return JsonResponse({'result': 'error','error': str(sys.exc_info()[1])}) + return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])}) else: try: if user_id: