thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  Easiest to just unload the entire store
  Hide measurements on new strain
  Fix char/strain sort order
This commit is contained in:
Matthew Dillon 2015-11-25 21:31:24 -07:00
commit 26dcecaa05
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/mixins/delete-model.js
View file

@ -8,6 +8,7 @@ export default Mixin.create({
actions: { actions: {
delete: function() { delete: function() {
this.get('model').destroyRecord().then(() => { this.get('model').destroyRecord().then(() => {
this.get('store').unloadAll();
this.transitionToRoute(this.get('transitionRoute')); this.transitionToRoute(this.get('transitionRoute'));
}); });
}, },

2
app/pods/protected/characteristics/show/measurements-table/template.hbs
View file

@ -7,7 +7,7 @@
<table class="flakes-table"> <table class="flakes-table">
<thead> <thead>
<tr> <tr>
<th {{action "changeSortParam" "strain.strainName"}} class="click">Strain</th> <th {{action "changeSortParam" "strain.sortOrder"}} class="click">Strain</th>
<th {{action "changeSortParam" "value"}} class="click">Value</th> <th {{action "changeSortParam" "value"}} class="click">Value</th>
<th {{action "changeSortParam" "notes"}} class="click">Notes</th> <th {{action "changeSortParam" "notes"}} class="click">Notes</th>
</tr> </tr>

30
app/pods/protected/strains/strain-form/template.hbs
View file

@ -53,18 +53,24 @@
</div> </div>
</div> </div>
</fieldset> </fieldset>
<div> {{#if isNew}}
{{ <div>
protected/strains/measurements-table Please save before adding measurements
strain=strain </div>
add-characteristic=(action "addCharacteristic") {{else}}
allCharacteristics=allCharacteristics <div>
save-measurement=(action "saveMeasurement") {{
delete-measurement=(action "deleteMeasurement") protected/strains/measurements-table
canEdit=strain.canEdit strain=strain
canAdd=metaData.canAdd add-characteristic=(action "addCharacteristic")
}} allCharacteristics=allCharacteristics
</div> save-measurement=(action "saveMeasurement")
delete-measurement=(action "deleteMeasurement")
canEdit=strain.canEdit
canAdd=metaData.canAdd
}}
</div>
{{/if}}
<br> <br>
<a class="button-red smaller" {{action 'cancel'}}> <a class="button-red smaller" {{action 'cancel'}}>
Cancel Cancel