[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections][master] 2 commits: HIPPLUG-1338 corrected model usages

[Arthur Bogaart]

Arthur Bogaart pushed to branch master at cms-community / 
hippo-plugin-selections


Commits:
2564b0b9 by Canh Ngo at 2016-07-19T09:15:10+02:00
HIPPLUG-1338 corrected model usages

(cherry picked from commit bd67487b5800d7f6f88977d1f1b6a9f8daa6d27c)

added TODO for next major release

(cherry picked from commit 2856f14471f6647fa82fb12e559c6fd05710b35b)

- - - - -
05996784 by Arthur Bogaart at 2016-07-21T13:58:27+02:00
HIPPLUG-1338 Reintegrate bugfix/HIPPLUG-1338

- - - - -


1 changed file:

- 
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java


Changes:

=====================================
addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
=====================================
--- 
a/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
+++ 
b/addon-cms/src/main/java/org/onehippo/forge/selection/frontend/plugin/DynamicMultiSelectPlugin.java
@@ -555,24 +555,27 @@ public class DynamicMultiSelectPlugin extends 
RenderPlugin {
     }
 
     /**
+     * TODO: UnselectLink and SelectLink should be combined and declared as 
static private classes.
+     * It should be done in the next major release, i.e., 5.x.
+     */
+
+    /**
      * Link unselect all values from a select list.
      */
     protected class UnselectLink extends AjaxLink {
 
         private ListMultipleChoice multiselect;
-        private IModel model;
 
         UnselectLink(String id, ListMultipleChoice multiselect, IModel model) {
-            super(id);
+            super(id, model);
             this.multiselect = multiselect;
-            this.model = model;
         }
 
         @Override
         public void onClick(AjaxRequestTarget target) {
 
             // clear model
-            this.model.setObject(null);
+            setModelObject(null);
 
             // make the multiselect update to remove selected items
             target.add(this.multiselect);
@@ -585,19 +588,17 @@ public class DynamicMultiSelectPlugin extends 
RenderPlugin {
     protected class SelectLink extends AjaxLink {
 
         private ListMultipleChoice multiselect;
-        private IModel model;
 
         SelectLink(String id, ListMultipleChoice multiselect, IModel model) {
-            super(id);
+            super(id, model);
             this.multiselect = multiselect;
-            this.model = model;
         }
 
         @Override
         public void onClick(AjaxRequestTarget target) {
 
             // select all options
-            this.model.setObject(multiselect.getChoices());
+            setModelObject(multiselect.getChoices());
 
             // make the multiselect update to remove selected items
             target.add(this.multiselect);



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-selections/compare/b2ec0e93b932341484234049881e763d886467f6...059967843338f02f5a4ca4cc2239c386623165e9

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn