Skip to content

Commit

Permalink
Merge branch 'master' into feature/dubdabasoduba-tt-1-issue-364
Browse files Browse the repository at this point in the history
  • Loading branch information
dubdabasoduba committed Feb 25, 2020
2 parents 06847f6 + 65c27b7 commit e80ab35
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ private List<View> attachJson(String stepName, Context context, JSONObject jsonO
uploadButton.setTag(R.id.openmrs_entity, openMrsEntity);
uploadButton.setTag(R.id.openmrs_entity_id, openMrsEntityId);
uploadButton.setTag(R.id.type, jsonObject.getString(JsonFormConstants.TYPE));
uploadButton.setTag(R.id.extraPopup, popup);
uploadButton.setTag(R.id.address, stepName + ":" + jsonObject.getString(JsonFormConstants.KEY));
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_NAME=1.7.23-SNAPSHOT
VERSION_NAME=1.7.24-SNAPSHOT
VERSION_CODE=1
GROUP=org.smartregister
POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard
Expand Down

0 comments on commit e80ab35

Please sign in to comment.