From: kenstir Date: Fri, 23 Oct 2015 02:01:11 +0000 (-0400) Subject: PlaceHold, HoldDetails - removed superfluous "recipient", which is already on the... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7876f84680e977ddab537be685106aa06868b02c;p=working%2FEvergreen.git PlaceHold, HoldDetails - removed superfluous "recipient", which is already on the screen in the action bar. --- diff --git a/Open-ILS/src/Android/core/res/layout/hold_details.xml b/Open-ILS/src/Android/core/res/layout/hold_details.xml index bb9e32f75b..9bd9f38244 100644 --- a/Open-ILS/src/Android/core/res/layout/hold_details.xml +++ b/Open-ILS/src/Android/core/res/layout/hold_details.xml @@ -25,23 +25,6 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="2" - android:text="@string/recipient" - /> - - - - - diff --git a/Open-ILS/src/Android/core/res/layout/place_hold.xml b/Open-ILS/src/Android/core/res/layout/place_hold.xml index 7d52430a34..922a373813 100644 --- a/Open-ILS/src/Android/core/res/layout/place_hold.xml +++ b/Open-ILS/src/Android/core/res/layout/place_hold.xml @@ -25,23 +25,6 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="2" - android:text="@string/recipient" - /> - - - - - diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java index b53389c648..2d58d42033 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java @@ -62,7 +62,7 @@ import android.widget.Toast; public class HoldDetails extends ActionBarActivity { - private final String TAG = HoldDetails.class.getName(); + private final String TAG = HoldDetails.class.getSimpleName(); public static final int RESULT_CODE_DELETE_HOLD = 5; @@ -70,16 +70,12 @@ public class HoldDetails extends ActionBarActivity { public static final int RESULT_CODE_CANCEL = 7; - private TextView recipient; - private TextView title; private TextView author; private TextView physical_description; - private TextView screen_title; - private AccountAccess accountAccess; private EditText expiration_date; @@ -140,7 +136,6 @@ public class HoldDetails extends ActionBarActivity { accountAccess = AccountAccess.getAccountAccess(); - recipient = (TextView) findViewById(R.id.hold_recipient); title = (TextView) findViewById(R.id.hold_title); author = (TextView) findViewById(R.id.hold_author); physical_description = (TextView) findViewById(R.id.hold_physical_description); @@ -152,7 +147,6 @@ public class HoldDetails extends ActionBarActivity { expiration_date = (EditText) findViewById(R.id.hold_expiration_date); thaw_date_edittext = (EditText) findViewById(R.id.hold_thaw_date); - recipient.setText(accountAccess.userName); title.setText(record.title); author.setText(record.author); if (record.recordInfo != null) diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java index 84303eda0f..65df3b48b8 100644 --- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java +++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java @@ -61,9 +61,7 @@ import android.widget.Toast; public class PlaceHold extends ActionBarActivity { - private final String TAG = PlaceHold.class.getName(); - - private TextView recipient; + private final String TAG = PlaceHold.class.getSimpleName(); private TextView title; @@ -71,8 +69,6 @@ public class PlaceHold extends ActionBarActivity { private TextView physical_description; - private TextView screen_title; - private AccountAccess accountAccess; private EditText expiration_date; @@ -140,7 +136,6 @@ public class PlaceHold extends ActionBarActivity { accountAccess = AccountAccess.getAccountAccess(); - recipient = (TextView) findViewById(R.id.hold_recipient); title = (TextView) findViewById(R.id.hold_title); author = (TextView) findViewById(R.id.hold_author); physical_description = (TextView) findViewById(R.id.hold_physical_description); @@ -154,7 +149,6 @@ public class PlaceHold extends ActionBarActivity { orgSelector = (Spinner) findViewById(R.id.hold_pickup_location); thaw_date_edittext = (EditText) findViewById(R.id.hold_thaw_date); - recipient.setText(accountAccess.userName); title.setText(record.title); author.setText(record.author); physical_description.setText(record.physical_description);