Skip to content

Commit

Permalink
Enhanced changelog show condition
Browse files Browse the repository at this point in the history
  • Loading branch information
wondie committed Jan 6, 2018
1 parent e365f4d commit 9e99b4b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion html/change_log.htm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2 >Entities and Column Ordering
</h2>
<p >With STDM 1.7 it is now possible to change the order of created entities and columns by simply dragging and dropping. The creation order for entities has an effect on how entities appear on the STDM menu, while the columns creation order reflects on how they appear on the forms.
</p>
<h2 >&nbsp;Label
<h2 >Column Label
</h2>
<p >Labeling of columns on a form is now easily customizable. You can now choose which label will appear next to a column field on a generated form. Normally, a label of a column is auto-generated from the value entered in&nbsp;Column Name&nbsp;field when creating columns. &nbsp;Now, with version 1.7, a new field called &nbsp;in the column editor allows you to change that behavior by letting you enter a value that will be used as a column label on the auto-generated form, see image below.
</p>
Expand Down
5 changes: 2 additions & 3 deletions plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@ def stdm_reg_version(self, metadata_version):
:param metadata_version: The metadata version
:type metadata_version: String
:return: Result of the check or update.
If reg_version is not set, it returns 'new'
If reg_version is different from metadata returns 'updated'
If reg_version is same as metadata returns 'non-updated'
:rtype: String
Expand All @@ -625,7 +624,7 @@ def stdm_reg_version(self, metadata_version):
self.reg_config.write(
{STDM_VERSION: metadata_version}
)
return 'new'
return 'updated'
elif metadata_version != reg_version:
self.reg_config.write(
{STDM_VERSION: metadata_version}
Expand All @@ -634,7 +633,7 @@ def stdm_reg_version(self, metadata_version):
md_major_version = metadata_version.rsplit('.', 1)[0]
reg_major_version = reg_version.rsplit('.', 1)[0]

if md_major_version !=reg_major_version:
if md_major_version != reg_major_version:
return 'updated'
else:
return 'non-updated'
Expand Down

0 comments on commit 9e99b4b

Please sign in to comment.