Skip to content

Commit 0a7c0e9

Browse files
pirhoopirhoo
committed
Merge branch 'release/v1.2.3'
2 parents 986b523 + 347a1a1 commit 0a7c0e9

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

‎app/detective/admin.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def formfield_for_choice_field(self, db_field, request, **kwargs):
5858
# Get the current topic with the ID set into the parent form
5959
topic = Topic.objects.get(id=request.topic_id)
6060
# Get the topic's models
61-
models = utils.get_topic_models(topic)
61+
models = topic.get_models()
6262
for model in models:
6363
model_name = getattr(model._meta, "verbose_name").title()
6464
subset = []

‎app/detective/models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def clean(self):
177177
def field(self):
178178
field = None
179179
if self.name:
180-
topic_models = utils.get_topic_models(self.topic)
180+
topic_models = self.topic.get_models()
181181
for model in topic_models:
182182
# Retreive every relationship field for this model
183183
for f in utils.get_model_fields(model):

‎app/detective/register.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def default_rules(topic):
4545
# ModelRules is a singleton that record every model rules
4646
rules = ModelRules()
4747
# We cant import this early to avoid bi-directional dependancies
48-
from app.detective.utils import get_topic_models, import_class
48+
from app.detective.utils import import_class
4949
# Get all registered models
50-
models = get_topic_models(topic)
50+
models = Topic.objects.get(module=topic).get_models()
5151
# Set "is_searchable" to true on every model with a name
5252
for model in models:
5353
# If the current model has a name

‎app/detective/templates/home.dj.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
{% compress js %}
1515
<script type="text/javascript" src="{% static 'components/jquery/jquery.min.js' %}"></script>
16-
<script type="text/javascript" src="{% static 'components/chroma-js/chroma.min.js' %}"></script>
17-
<script type="text/javascript" src="{% static 'components/kartograph.js/kartograph-0.8.2.min.js' %}"></script>
16+
<script type="text/javascript" src="{% static 'components/chroma-js/index.js' %}"></script>
17+
<script type="text/javascript" src="{% static 'components/kartograph.js/index.js' %}"></script>
1818
<script type="text/javascript" src="{% static 'components/raphael/raphael-min.js' %}"></script>
1919
<script type="text/javascript" src="{% static 'components/jquery.scrollTo/jquery.scrollTo.min.js' %}"></script>
2020
<script type="text/javascript" src="{% static 'components/js-md5/js/md5.min.js' %}"></script>
@@ -24,10 +24,10 @@
2424
<script type="text/javascript" src="{% static 'components/d3/d3.js' %}"></script>
2525
{% endcompress %}
2626

27-
<script type="text/javascript" src="{% static 'components/unstable-angular-complete/angular.min.js' %}"></script>
28-
<script type="text/javascript" src="{% static 'components/unstable-angular-complete/angular-cookies.min.js' %}"></script>
29-
<script type="text/javascript" src="{% static 'components/unstable-angular-complete/angular-resource.min.js' %}"></script>
30-
<script type="text/javascript" src="{% static 'components/unstable-angular-complete/angular-sanitize.min.js' %}"></script>
27+
<script type="text/javascript" src="{% static 'components/angular-all-unstable/angular.min.js' %}"></script>
28+
<script type="text/javascript" src="{% static 'components/angular-all-unstable/angular-cookies.min.js' %}"></script>
29+
<script type="text/javascript" src="{% static 'components/angular-all-unstable/angular-resource.min.js' %}"></script>
30+
<script type="text/javascript" src="{% static 'components/angular-all-unstable/angular-sanitize.min.js' %}"></script>
3131
<script type="text/javascript" src="{% static 'components/angular-elastic/elastic.js' %}"></script>
3232
<script type="text/javascript" src="{% static 'components/angular-ui-bootstrap-bower/ui-bootstrap-tpls.min.js' %}"></script>
3333
<script type="text/javascript" src="{% static 'components/ng-file-upload/angular-file-upload.min.js' %}"></script>

‎app/detective/tests/api.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,5 +764,4 @@ def test_topic_has_summary_syntax_from_ontology(self):
764764

765765
def test_topic_has_summary_syntax_from_file(self):
766766
resp = self.api_client.get('/api/energy/v1/summary/syntax/', format='json', authentication=self.get_super_credentials())
767-
print resp.content
768767
self.assertValidJSONResponse(resp)

‎app/detective/topics/common/summary.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def summary_forms(self, bundle, request):
146146
rulesManager = topics_rules()
147147
# Fetch every registered model
148148
# to print out its rules
149-
for model in utils.get_topic_models(self.topic.module):
149+
for model in self.topic.get_models():
150150
name = model.__name__.lower()
151151
rules = rulesManager.model(model).all()
152152
fields = utils.get_model_fields(model)
@@ -384,7 +384,7 @@ def search(self, query):
384384
def rdf_search(self, subject, predicate, obj):
385385
obj = obj["name"] if "name" in obj else obj
386386
# retrieve all models in current topic
387-
all_models = dict((model.__name__, model) for model in utils.get_topic_models(self.topic.module))
387+
all_models = dict((model.__name__, model) for model in self.topic.get_models())
388388
# If the received obj describe a literal value
389389
if self.is_registered_literal(predicate["name"]):
390390
# Get the field name into the database
@@ -434,7 +434,7 @@ def rdf_search(self, subject, predicate, obj):
434434
def get_models_output(self):
435435
# Select only some atribute
436436
output = lambda m: {'name': m.__name__, 'label': m._meta.verbose_name.title()}
437-
return [ output(m) for m in utils.get_topic_models(self.topic.module) ]
437+
return [ output(m) for m in self.topic.get_models() ]
438438

439439
def get_relationship_search(self):
440440
isRelationship = lambda t: t.type == "relationship"

‎bower.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"name": "detective",
3-
"version": "1.2.2",
3+
"version": "1.2.3",
44
"dependencies": {
55
"angular-elastic": "2.2.0",
66
"angular-ui-bootstrap-bower": "0.6.0",
77
"bootstrap": "3.0.0",
8-
"chroma-js": "0.5.2",
8+
"chroma-js": "https://raw.github.com/gka/chroma.js/7b06f8df0e95450fa6ed9266c3cc3efbf3e53fc9/chroma.min.js",
99
"jquery.scrollTo": "1.4.6",
1010
"js-md5": "1.0.3",
1111
"modernizr": "2.6.2",
1212
"raphael": "2.1.2",
1313
"typeahead.js": "0.9.3",
1414
"underscore": "1.5.2",
15-
"unstable-angular-complete": "1.1.5",
16-
"kartograph.js": "git://github.com/kartograph/kartograph.js",
15+
"angular-all-unstable": "1.1.5",
16+
"kartograph.js": "https://raw.github.com/kartograph/kartograph.js/3d89db48d9e1ea020972e8fb9566bea1dc8aa495/kartograph-0.8.2.min.js",
1717
"jquery": "1.9.1",
1818
"ng-file-upload": "~1.2.3",
1919
"ngprogress-lite": "~1.0.4",

0 commit comments

Comments
 (0)